From 2ad40c25c9778494bd5938e10bb3b50d55e56ec8 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 18 Mar 2015 14:29:02 -0700 Subject: [PATCH] addressed PR feedback --- src/compiler/checker.ts | 4 +- .../diagnosticInformationMap.generated.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- src/compiler/emitter.ts | 4 +- src/compiler/types.ts | 2 +- .../baselines/reference/APISample_compile.js | 2 +- .../reference/APISample_compile.types | 4 +- tests/baselines/reference/APISample_linter.js | 2 +- .../reference/APISample_linter.types | 4 +- .../reference/APISample_transform.js | 2 +- .../reference/APISample_transform.types | 4 +- .../baselines/reference/APISample_watcher.js | 2 +- .../reference/APISample_watcher.types | 4 +- .../declarationEmitDefaultExport7.errors.txt | 4 +- .../compiler/es6ImportDefaultBinding.ts.orig | 18 ------- ...aultBindingFollowedWithNamedImport.ts.orig | 34 ------------- ...ultBindingFollowedWithNamedImport1.ts.orig | 24 --------- ...tBindingFollowedWithNamedImportDts.ts.orig | 28 ----------- ...indingFollowedWithNamespaceBinding.ts.orig | 13 ----- ...ndingFollowedWithNamespaceBinding1.ts.orig | 14 ------ ...es6ImportDefaultBindingMergeErrors.ts.orig | 19 ------- ...ortDefaultBindingNoDefaultProperty.ts.orig | 11 ----- .../compiler/es6ImportNameSpaceImport.ts.orig | 17 ------- ...s6ImportNameSpaceImportMergeErrors.ts.orig | 19 ------- ...mportNameSpaceImportNoNamedExports.ts.orig | 13 ----- .../compiler/es6ImportNamedImport.ts.orig | 49 ------------------- ...mportNamedImportInExportAssignment.ts.orig | 13 ----- ...edImportInIndirectExportAssignment.ts.orig | 17 ------- .../es6ImportNamedImportMergeErrors.ts.orig | 23 --------- ...es6ImportNamedImportNoExportMember.ts.orig | 13 ----- ...es6ImportNamedImportNoNamedExports.ts.orig | 14 ------ .../es6ImportWithoutFromClause.ts.orig | 16 ------ ...outFromClauseNonInstantiatedModule.ts.orig | 13 ----- 33 files changed, 21 insertions(+), 389 deletions(-) delete mode 100644 tests/cases/compiler/es6ImportDefaultBinding.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts.orig delete mode 100644 tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNameSpaceImport.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImport.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImportMergeErrors.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImportNoExportMember.ts.orig delete mode 100644 tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts.orig delete mode 100644 tests/cases/compiler/es6ImportWithoutFromClause.ts.orig delete mode 100644 tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts.orig diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7b200b92fe0..a21cd936ad1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1861,7 +1861,7 @@ module ts { } } - function setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]{ + function collectLinkedAliases(node: Identifier): Node[]{ var exportSymbol: Symbol; if (node.parent && node.parent.kind === SyntaxKind.ExportAssignment) { exportSymbol = resolveName(node.parent, node.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, Diagnostics.Cannot_find_name_0, node); @@ -11268,7 +11268,7 @@ module ts { isEntityNameVisible, getConstantValue, isUnknownIdentifier, - setDeclarationsOfIdentifierAsVisible, + collectLinkedAliases, getBlockScopedVariableId, }; } diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index feadd63abd7..777639c6b34 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -414,7 +414,7 @@ module ts { Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: DiagnosticCategory.Error, 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: DiagnosticCategory.Error, 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: DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." }, - Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4081, category: DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." }, + Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." }, 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: DiagnosticCategory.Error, 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: DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index fbd9866f967..27275b041da 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1651,7 +1651,7 @@ }, "Default export of the module has or is using private name '{0}'.": { "category": "Error", - "code": 4081 + "code": 4082 }, "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.": { "category": "Error", diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 1ea1562b587..4d077709d2c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -769,7 +769,7 @@ module ts { // Make all the declarations visible for the export name if (node.expression.kind === SyntaxKind.Identifier) { - let nodes = resolver.setDeclarationsOfIdentifierAsVisible(node.expression); + let nodes = resolver.collectLinkedAliases(node.expression); // write each of these declarations asynchronously writeAsynchronousModuleElements(nodes); @@ -967,7 +967,7 @@ module ts { emitImportOrExportSpecifier(node); // Make all the declarations visible for the export name - let nodes = resolver.setDeclarationsOfIdentifierAsVisible(node.propertyName || node.name); + let nodes = resolver.collectLinkedAliases(node.propertyName || node.name); // write each of these declarations asynchronously writeAsynchronousModuleElements(nodes); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4209d424555..2f2d6f47f93 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1210,7 +1210,7 @@ module ts { isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; + collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index b3f3b8bbd76..611230cf118 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -945,7 +945,7 @@ declare module "typescript" { isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; + collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index abaaff0dee6..cd924fe677c 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3039,8 +3039,8 @@ declare module "typescript" { >node : Declaration >Declaration : Declaration - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; ->setDeclarationsOfIdentifierAsVisible : (node: Identifier) => Node[] + collectLinkedAliases(node: Identifier): Node[]; +>collectLinkedAliases : (node: Identifier) => Node[] >node : Identifier >Identifier : Identifier >Node : Node diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b36e7438145..1ac1ec35da7 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -976,7 +976,7 @@ declare module "typescript" { isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; + collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 019fb66d79f..c993153b7b6 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3185,8 +3185,8 @@ declare module "typescript" { >node : Declaration >Declaration : Declaration - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; ->setDeclarationsOfIdentifierAsVisible : (node: Identifier) => Node[] + collectLinkedAliases(node: Identifier): Node[]; +>collectLinkedAliases : (node: Identifier) => Node[] >node : Identifier >Identifier : Identifier >Node : Node diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 83fad82daee..5e8048680a0 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -977,7 +977,7 @@ declare module "typescript" { isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; + collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index fac36eb3891..b34bbdd936e 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3135,8 +3135,8 @@ declare module "typescript" { >node : Declaration >Declaration : Declaration - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; ->setDeclarationsOfIdentifierAsVisible : (node: Identifier) => Node[] + collectLinkedAliases(node: Identifier): Node[]; +>collectLinkedAliases : (node: Identifier) => Node[] >node : Identifier >Identifier : Identifier >Node : Node diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 90e8df87203..95803d31906 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1014,7 +1014,7 @@ declare module "typescript" { isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; isDeclarationVisible(node: Declaration): boolean; - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; + collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index c65b549a4b4..31b762d0484 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -3308,8 +3308,8 @@ declare module "typescript" { >node : Declaration >Declaration : Declaration - setDeclarationsOfIdentifierAsVisible(node: Identifier): Node[]; ->setDeclarationsOfIdentifierAsVisible : (node: Identifier) => Node[] + collectLinkedAliases(node: Identifier): Node[]; +>collectLinkedAliases : (node: Identifier) => Node[] >node : Identifier >Identifier : Identifier >Node : Node diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt b/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt index 2fb5bdab12c..f19766cbb00 100644 --- a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt +++ b/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/declarationEmitDefaultExport7.ts(2,1): error TS4081: Default export of the module has or is using private name 'A'. +tests/cases/compiler/declarationEmitDefaultExport7.ts(2,1): error TS4082: Default export of the module has or is using private name 'A'. ==== tests/cases/compiler/declarationEmitDefaultExport7.ts (1 errors) ==== class A {} export default new A(); ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4081: Default export of the module has or is using private name 'A'. +!!! error TS4082: Default export of the module has or is using private name 'A'. \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportDefaultBinding.ts.orig b/tests/cases/compiler/es6ImportDefaultBinding.ts.orig deleted file mode 100644 index 90ac95e7add..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBinding.ts.orig +++ /dev/null @@ -1,18 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportDefaultBinding_0.ts -var a = 10; -export = a; - -// @filename: es6ImportDefaultBinding_1.ts -import defaultBinding from "es6ImportDefaultBinding_0"; -<<<<<<< HEAD -var x = defaultBinding; -import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used -======= ->>>>>>> master diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts.orig deleted file mode 100644 index 1605ecde578..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts.orig +++ /dev/null @@ -1,34 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportDefaultBindingFollowedWithNamedImport_0.ts -export var a = 10; -export var x = a; -export var m = a; - -// @filename: es6ImportDefaultBindingFollowedWithNamedImport_1.ts -<<<<<<< HEAD -import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -var x1: number = a; -import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -var x1: number = b; -import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -var x1: number = x; -var x1: number = y; -import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -var x1: number = z; -import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -var x1: number = m; -======= -import defaultBinding, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; -import defaultBinding, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport_0"; ->>>>>>> master diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts.orig deleted file mode 100644 index 8c55ca97fe5..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts.orig +++ /dev/null @@ -1,24 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportDefaultBindingFollowedWithNamedImport1_0.ts -var a = 10; -export = a; - -// @filename: es6ImportDefaultBindingFollowedWithNamedImport1_1.ts -import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding1; -import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding2; -import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding3; -import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding4; -import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding5; -import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -var x1: number = defaultBinding6; diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts.orig deleted file mode 100644 index a55cc6059d4..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts.orig +++ /dev/null @@ -1,28 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs -// @declaration: true - -// @filename: server.ts -export class a { } -export class x { } -export class m { } -export class a11 { } -export class a12 { } -export class x11 { } - -// @filename: client.ts -import defaultBinding1, { } from "server"; -import defaultBinding2, { a } from "server"; -export var x1 = new a(); -import defaultBinding3, { a11 as b } from "server"; -export var x2 = new b(); -import defaultBinding4, { x, a12 as y } from "server"; -export var x4 = new x(); -export var x5 = new y(); -import defaultBinding5, { x11 as z, } from "server"; -export var x3 = new z(); -import defaultBinding6, { m, } from "server"; -export var x6 = new m(); diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts.orig deleted file mode 100644 index dfc2a669e46..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts.orig +++ /dev/null @@ -1,13 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts -export var a = 10; - -// @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; -var x: number = nameSpaceBinding.a; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts.orig deleted file mode 100644 index c0acefb4525..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts.orig +++ /dev/null @@ -1,14 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts -var a = 10; -export = a; - -// @filename: es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; -var x: number = defaultBinding; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts.orig deleted file mode 100644 index 0cff021cae6..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts.orig +++ /dev/null @@ -1,19 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportDefaultBindingMergeErrors_0.ts -var a = 10; -export = a; - -// @filename: es6ImportDefaultBindingMergeErrors_1.ts -import defaultBinding from "es6ImportDefaultBindingMergeErrors_0"; -interface defaultBinding { // This is ok -} -var x = defaultBinding; -import defaultBinding2 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error -var defaultBinding2 = "hello world"; -import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error -import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be error diff --git a/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts.orig b/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts.orig deleted file mode 100644 index 73515821e69..00000000000 --- a/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts.orig +++ /dev/null @@ -1,11 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportDefaultBindingNoDefaultProperty_0.ts -export var a = 10; - -// @filename: es6ImportDefaultBindingNoDefaultProperty_1.ts -import defaultBinding from "es6ImportDefaultBindingNoDefaultProperty_0"; diff --git a/tests/cases/compiler/es6ImportNameSpaceImport.ts.orig b/tests/cases/compiler/es6ImportNameSpaceImport.ts.orig deleted file mode 100644 index 370696911b3..00000000000 --- a/tests/cases/compiler/es6ImportNameSpaceImport.ts.orig +++ /dev/null @@ -1,17 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportNameSpaceImport_0.ts -export var a = 10; - -// @filename: es6ImportNameSpaceImport_1.ts -import * as nameSpaceBinding from "es6ImportNameSpaceImport_0"; -<<<<<<< HEAD -var x = nameSpaceBinding.a; -import * as nameSpaceBinding2 from "es6ImportNameSpaceImport_0"; // elide this -======= ->>>>>>> master diff --git a/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts.orig b/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts.orig deleted file mode 100644 index a101a65368c..00000000000 --- a/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts.orig +++ /dev/null @@ -1,19 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= -// @target: es5 ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportNameSpaceImportMergeErrors_0.ts -export var a = 10; - -// @filename: es6ImportNameSpaceImportMergeErrors_1.ts -import * as nameSpaceBinding from "es6ImportNameSpaceImportMergeErrors_0"; -interface nameSpaceBinding { } // this should be ok - -import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error -import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error - -import * as nameSpaceBinding3 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error -var nameSpaceBinding3 = 10; diff --git a/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts.orig b/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts.orig deleted file mode 100644 index 9a885642788..00000000000 --- a/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts.orig +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= -// @target: es5 ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportNameSpaceImportNoNamedExports_0.ts -var a = 10; -export = a; - -// @filename: es6ImportNameSpaceImportNoNamedExports_1.ts -import * as nameSpaceBinding from "es6ImportNameSpaceImportNoNamedExports_0"; // error \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportNamedImport.ts.orig b/tests/cases/compiler/es6ImportNamedImport.ts.orig deleted file mode 100644 index d2e1eec5ca7..00000000000 --- a/tests/cases/compiler/es6ImportNamedImport.ts.orig +++ /dev/null @@ -1,49 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportNamedImport_0.ts -export var a = 10; -export var x = a; -export var m = a; -export var a1 = 10; -export var x1 = 10; -export var z1 = 10; -export var z2 = 10; -export var aaaa = 10; - -// @filename: es6ImportNamedImport_1.ts -import { } from "es6ImportNamedImport_0"; -import { a } from "es6ImportNamedImport_0"; -var xxxx = a; -import { a as b } from "es6ImportNamedImport_0"; -var xxxx = b; -import { x, a as y } from "es6ImportNamedImport_0"; -var xxxx = x; -var xxxx = y; -import { x as z, } from "es6ImportNamedImport_0"; -var xxxx = z; -import { m, } from "es6ImportNamedImport_0"; -var xxxx = m; -import { a1, x1 } from "es6ImportNamedImport_0"; -<<<<<<< HEAD -var xxxx = a1; -var xxxx = x1; -import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0"; -var xxxx = a11; -var xxxx = x11; -import { z1 } from "es6ImportNamedImport_0"; -var z111 = z1; -import { z2 as z3 } from "es6ImportNamedImport_0"; -var z2 = z3; // z2 shouldn't give redeclare error - -// These are elided -import { aaaa } from "es6ImportNamedImport_0"; -// These are elided -import { aaaa as bbbb } from "es6ImportNamedImport_0"; -======= -import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0"; ->>>>>>> master diff --git a/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts.orig b/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts.orig deleted file mode 100644 index b5f34c33468..00000000000 --- a/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts.orig +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs -// @declaration: true - -// @filename: es6ImportNamedImportInExportAssignment_0.ts -export var a = 10; - -// @filename: es6ImportNamedImportInExportAssignment_1.ts -import { a } from "es6ImportNamedImportInExportAssignment_0"; -export = a; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts.orig b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts.orig deleted file mode 100644 index 9d21fa7973a..00000000000 --- a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts.orig +++ /dev/null @@ -1,17 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs -// @declaration: true - -// @filename: es6ImportNamedImportInIndirectExportAssignment_0.ts -export module a { - export class c { - } -} - -// @filename: es6ImportNamedImportInIndirectExportAssignment_1.ts -import { a } from "es6ImportNamedImportInIndirectExportAssignment_0"; -import x = a; -export = x; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts.orig b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts.orig deleted file mode 100644 index 833710871d2..00000000000 --- a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts.orig +++ /dev/null @@ -1,23 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportNamedImportMergeErrors_0.ts -export var a = 10; -export var x = a; -export var z = a; -export var z1 = a; - -// @filename: es6ImportNamedImportMergeErrors_1.ts -import { a } from "es6ImportNamedImportMergeErrors_0"; -interface a { } // shouldnt be error -import { x as x1 } from "es6ImportNamedImportMergeErrors_0"; -interface x1 { } // shouldnt be error -import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error -var x = 10; -import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error -var x44 = 10; -import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error -import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error diff --git a/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts.orig b/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts.orig deleted file mode 100644 index 999c1d985b3..00000000000 --- a/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts.orig +++ /dev/null @@ -1,13 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportNamedImportNoExportMember_0.ts -export var a = 10; -export var x = a; - -// @filename: es6ImportNamedImport_1.ts -import { a1 } from "es6ImportNamedImportNoExportMember_0"; -import { x1 as x } from "es6ImportNamedImportNoExportMember_0"; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts.orig b/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts.orig deleted file mode 100644 index 3b9e6341229..00000000000 --- a/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts.orig +++ /dev/null @@ -1,14 +0,0 @@ -<<<<<<< HEAD -// @target: es6 -======= -// @target: es5 ->>>>>>> master -// @module: commonjs - -// @filename: es6ImportNamedImportNoNamedExports_0.ts -var a = 10; -export = a; - -// @filename: es6ImportNamedImportNoNamedExports_1.ts -import { a } from "es6ImportNamedImportNoNamedExports_0"; -import { a as x } from "es6ImportNamedImportNoNamedExports_0"; \ No newline at end of file diff --git a/tests/cases/compiler/es6ImportWithoutFromClause.ts.orig b/tests/cases/compiler/es6ImportWithoutFromClause.ts.orig deleted file mode 100644 index b2c72541d3d..00000000000 --- a/tests/cases/compiler/es6ImportWithoutFromClause.ts.orig +++ /dev/null @@ -1,16 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportWithoutFromClause_0.ts -export var a = 10; - -// @filename: es6ImportWithoutFromClause_1.ts -<<<<<<< HEAD -import "es6ImportWithoutFromClause_0"; -======= -import "es6ImportWithoutFromClause_0"; ->>>>>>> master diff --git a/tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts.orig b/tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts.orig deleted file mode 100644 index 7ffeae2cbaa..00000000000 --- a/tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts.orig +++ /dev/null @@ -1,13 +0,0 @@ -// @target: es6 -<<<<<<< HEAD -// @module: commonjs -======= ->>>>>>> master -// @declaration: true - -// @filename: es6ImportWithoutFromClauseNonInstantiatedModule_0.ts -export interface i { -} - -// @filename: es6ImportWithoutFromClauseNonInstantiatedModule_1.ts -import "es6ImportWithoutFromClauseNonInstantiatedModule_0"; \ No newline at end of file