From c496c2f3c0da831554a35f4b6dff74fd7e475a57 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 1 Oct 2015 18:56:36 -0700 Subject: [PATCH 01/13] CI Against Node 4.1 Perf isn't as bad as 0.12, and it's the new LTS release series. TBH, we should probably also CI against `'node'` for the latest public version. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 572ac835cd4..954589f2eec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: + - '4.1' - '0.10' -sudo: false \ No newline at end of file +sudo: false From 7f3bfcf26aa6ba8b70b38990a3db9aefc772a38e Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Mon, 5 Oct 2015 15:48:03 -0700 Subject: [PATCH 02/13] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 954589f2eec..03e319f6b16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js node_js: - - '4.1' + - '4' - '0.10' sudo: false From 88bffac07ff5288531c139f221576fc4235e4923 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 8 Oct 2015 14:26:43 -0700 Subject: [PATCH 03/13] Don't issue completion in JSX text Fixes #5096 --- src/services/services.ts | 15 ++++++++++++++- tests/cases/fourslash/tsxCompletion9.ts | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/tsxCompletion9.ts diff --git a/src/services/services.ts b/src/services/services.ts index 9a6afb5f1e0..3eb5ec319ad 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3311,11 +3311,24 @@ namespace ts { let start = new Date().getTime(); let result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) || isSolelyIdentifierDefinitionLocation(contextToken) || - isDotOfNumericLiteral(contextToken); + isDotOfNumericLiteral(contextToken) || + isInJsxText(contextToken); log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start)); return result; } + function isInJsxText(contextToken: Node): boolean { + if (contextToken.kind === SyntaxKind.JsxText) { + return true; + } + + return contextToken.kind === SyntaxKind.GreaterThanToken && + contextToken.parent && + (contextToken.parent.kind === SyntaxKind.JsxOpeningElement || + contextToken.parent.kind === SyntaxKind.JsxSelfClosingElement || + contextToken.parent.kind === SyntaxKind.JsxClosingElement); + } + function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { if (previousToken) { let containingNodeKind = previousToken.parent.kind; diff --git a/tests/cases/fourslash/tsxCompletion9.ts b/tests/cases/fourslash/tsxCompletion9.ts new file mode 100644 index 00000000000..dbb6c46293b --- /dev/null +++ b/tests/cases/fourslash/tsxCompletion9.ts @@ -0,0 +1,18 @@ +/// + +//@Filename: file.tsx +//// declare module JSX { +//// interface Element { } +//// interface IntrinsicElements { +//// div: { ONE: string; TWO: number; } +//// } +//// } +//// var x1 =
/*1*/ hello /*2*/ world /*3*/
; +//// var x2 =
/*4*/
/*5*/ world /*6*/
; +//// var x3 =
/*7*/
/*8*/world/*9*/
; +//// var x4 =
/*10*/
; + +for (var i = 1; i <= 10; i++) { + goTo.marker(i + ''); + verify.completionListIsEmpty(); +} From b1c83033007657b32d8ee777130357447700feed Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 8 Oct 2015 14:55:11 -0700 Subject: [PATCH 04/13] Fix case for completion on the line after a self-closing element --- src/services/services.ts | 15 ++++++++++----- tests/cases/fourslash/tsxCompletion9.ts | 6 ++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 3eb5ec319ad..0fd76eff61f 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3322,11 +3322,16 @@ namespace ts { return true; } - return contextToken.kind === SyntaxKind.GreaterThanToken && - contextToken.parent && - (contextToken.parent.kind === SyntaxKind.JsxOpeningElement || - contextToken.parent.kind === SyntaxKind.JsxSelfClosingElement || - contextToken.parent.kind === SyntaxKind.JsxClosingElement); + if (contextToken.kind === SyntaxKind.GreaterThanToken && contextToken.parent) { + if (contextToken.parent.kind === SyntaxKind.JsxOpeningElement) { + return true; + } + + if (contextToken.parent.kind === SyntaxKind.JsxClosingElement || contextToken.parent.kind === SyntaxKind.JsxSelfClosingElement) { + return contextToken.parent.parent && contextToken.parent.parent.kind === SyntaxKind.JsxElement; + } + } + return false; } function isNewIdentifierDefinitionLocation(previousToken: Node): boolean { diff --git a/tests/cases/fourslash/tsxCompletion9.ts b/tests/cases/fourslash/tsxCompletion9.ts index dbb6c46293b..12542cc6b5b 100644 --- a/tests/cases/fourslash/tsxCompletion9.ts +++ b/tests/cases/fourslash/tsxCompletion9.ts @@ -11,8 +11,14 @@ //// var x2 =
/*4*/
/*5*/ world /*6*/
; //// var x3 =
/*7*/
/*8*/world/*9*/
; //// var x4 =
/*10*/
; +////
+//// /*end*/ +//// for (var i = 1; i <= 10; i++) { goTo.marker(i + ''); verify.completionListIsEmpty(); } + +goTo.marker('end'); +verify.not.completionListIsEmpty(); From 1e708b46a7251ea9a8b6b4b8c5c1d925e098fed6 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 8 Oct 2015 15:31:59 -0700 Subject: [PATCH 05/13] Implement not.greaterThan for completion list --- src/harness/fourslash.ts | 13 ++++++++++--- tests/cases/fourslash/fourslash.ts | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index a846077a85f..2b6f6ee8d0e 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -588,14 +588,21 @@ namespace FourSlash { } } - public verifyCompletionListItemsCountIsGreaterThan(count: number) { + public verifyCompletionListItemsCountIsGreaterThan(count: number, negative: boolean) { this.taoInvalidReason = "verifyCompletionListItemsCountIsGreaterThan NYI"; let completions = this.getCompletionListAtCaret(); let itemsCount = completions.entries.length; - if (itemsCount <= count) { - this.raiseError(`Expected completion list items count to be greater than ${count}, but is actually ${itemsCount}`); + if (negative) { + if (itemsCount > count) { + this.raiseError(`Expected completion list items count to not be greater than ${count}, but is actually ${itemsCount}`); + } + } + else { + if (itemsCount <= count) { + this.raiseError(`Expected completion list items count to be greater than ${count}, but is actually ${itemsCount}`); + } } } diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 42cfc1248b0..8d1ee35dc1a 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -205,7 +205,7 @@ module FourSlashInterface { // Verifies the completion list items count to be greater than the specified amount. The // completion list is brought up if necessary public completionListItemsCountIsGreaterThan(count: number) { - FourSlash.currentTestState.verifyCompletionListItemsCountIsGreaterThan(count); + FourSlash.currentTestState.verifyCompletionListItemsCountIsGreaterThan(count, this.negative); } public completionListIsEmpty() { From 24334b506c28b58ba3c30528b5044cd4db05e778 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 8 Oct 2015 15:32:36 -0700 Subject: [PATCH 06/13] Only show the opening tag name when completing a close tag Fixes #5096 --- src/services/services.ts | 19 ++++++++++++++++--- tests/cases/fourslash/tsxCompletion10.ts | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 tests/cases/fourslash/tsxCompletion10.ts diff --git a/src/services/services.ts b/src/services/services.ts index 0fd76eff61f..84794e95a6e 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3105,6 +3105,7 @@ namespace ts { let node = currentToken; let isRightOfDot = false; let isRightOfOpenTag = false; + let isStartingCloseTag = false; let location = getTouchingPropertyName(sourceFile, position); if (contextToken) { @@ -3130,9 +3131,14 @@ namespace ts { return undefined; } } - else if (kind === SyntaxKind.LessThanToken && sourceFile.languageVariant === LanguageVariant.JSX) { - isRightOfOpenTag = true; - location = contextToken; + else if (sourceFile.languageVariant === LanguageVariant.JSX) { + if (kind === SyntaxKind.LessThanToken) { + isRightOfOpenTag = true; + location = contextToken; + } + else if (kind === SyntaxKind.SlashToken && contextToken.parent.kind === SyntaxKind.JsxClosingElement) { + isStartingCloseTag = true; + } } } @@ -3155,6 +3161,13 @@ namespace ts { isMemberCompletion = true; isNewIdentifierLocation = false; } + else if (isStartingCloseTag) { + let tagName = (contextToken.parent.parent).openingElement.tagName; + symbols = [typeChecker.getSymbolAtLocation(tagName)]; + + isMemberCompletion = true; + isNewIdentifierLocation = false; + } else { // For JavaScript or TypeScript, if we're not after a dot, then just try to get the // global symbols in scope. These results should be valid for either language as diff --git a/tests/cases/fourslash/tsxCompletion10.ts b/tests/cases/fourslash/tsxCompletion10.ts new file mode 100644 index 00000000000..cf8b3068f10 --- /dev/null +++ b/tests/cases/fourslash/tsxCompletion10.ts @@ -0,0 +1,15 @@ +/// + +//@Filename: file.tsx +//// declare module JSX { +//// interface Element { } +//// interface IntrinsicElements { +//// div: { ONE: string; TWO: number; } +//// } +//// } +//// var x1 =
Date: Mon, 12 Oct 2015 14:27:33 -0700 Subject: [PATCH 07/13] Remove --experimentalAsyncFunctions --- src/compiler/checker.ts | 4 ---- src/compiler/commandLineParser.ts | 5 ----- src/compiler/diagnosticMessages.json | 8 -------- src/compiler/program.ts | 5 ----- src/compiler/types.ts | 1 - 5 files changed, 23 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 903addec182..110332b6224 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11759,10 +11759,6 @@ namespace ts { checkSignatureDeclaration(node); let isAsync = isAsyncFunctionLike(node); if (isAsync) { - if (!compilerOptions.experimentalAsyncFunctions) { - error(node, Diagnostics.Experimental_support_for_async_functions_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalAsyncFunctions_to_remove_this_warning); - } - emitAwaiter = true; } diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 731a37a8cb7..9a8c0ac416f 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -222,11 +222,6 @@ namespace ts { type: "boolean", description: Diagnostics.Watch_input_files, }, - { - name: "experimentalAsyncFunctions", - type: "boolean", - description: Diagnostics.Enables_experimental_support_for_ES7_async_functions - }, { name: "experimentalDecorators", type: "boolean", diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index b391545a733..fda876fa36b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -783,10 +783,6 @@ "category": "Error", "code": 1245 }, - "Experimental support for async functions is a feature that is subject to change in a future release. Specify '--experimentalAsyncFunctions' to remove this warning.": { - "category": "Error", - "code": 1246 - }, "'with' statements are not allowed in an async function block.": { "category": "Error", @@ -2282,10 +2278,6 @@ "category": "Message", "code": 6066 }, - "Option 'experimentalAsyncFunctions' cannot be specified when targeting ES5 or lower.": { - "category": "Message", - "code": 6067 - }, "Enables experimental support for ES7 async functions.": { "category": "Message", "code": 6068 diff --git a/src/compiler/program.ts b/src/compiler/program.ts index c6d3a245a8d..abef5088fbb 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1076,11 +1076,6 @@ namespace ts { !options.experimentalDecorators) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators")); } - - if (options.experimentalAsyncFunctions && - options.target !== ScriptTarget.ES6) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_experimentalAsyncFunctions_cannot_be_specified_when_targeting_ES5_or_lower)); - } } } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index cbaa3e65e27..2de545ce32f 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2080,7 +2080,6 @@ namespace ts { watch?: boolean; isolatedModules?: boolean; experimentalDecorators?: boolean; - experimentalAsyncFunctions?: boolean; emitDecoratorMetadata?: boolean; moduleResolution?: ModuleResolutionKind; /* @internal */ stripInternal?: boolean; From e9bed76baaaeca2c7593adbb3315cb0dde7d014c Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 12 Oct 2015 14:27:58 -0700 Subject: [PATCH 08/13] Remove --experimentalAsyncFunctions from tests --- .../async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction1_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction4_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction6_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction7_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction8_es6.ts | 1 - .../async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts | 1 - .../asyncArrowFunctionCapturesArguments_es6.ts | 1 - .../es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6.ts | 1 - .../cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts | 1 - tests/cases/conformance/async/es6/asyncAwait_es6.ts | 1 - tests/cases/conformance/async/es6/asyncClass_es6.ts | 1 - tests/cases/conformance/async/es6/asyncConstructor_es6.ts | 1 - tests/cases/conformance/async/es6/asyncDeclare_es6.ts | 1 - tests/cases/conformance/async/es6/asyncEnum_es6.ts | 1 - tests/cases/conformance/async/es6/asyncGetter_es6.ts | 1 - tests/cases/conformance/async/es6/asyncInterface_es6.ts | 1 - tests/cases/conformance/async/es6/asyncModule_es6.ts | 1 - tests/cases/conformance/async/es6/asyncSetter_es6.ts | 1 - .../es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts | 1 - .../es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts | 1 - .../es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts | 1 - .../es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts | 1 - .../es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression1_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression2_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression3_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression4_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression5_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression6_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression7_es6.ts | 1 - .../async/es6/awaitCallExpression/awaitCallExpression8_es6.ts | 1 - tests/cases/conformance/async/es6/awaitUnion_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration4_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration6_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts | 1 - .../es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts | 1 - 51 files changed, 51 deletions(-) diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts index bb9f8a54e44..0959ed6c561 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async foo(): Promise => { // Legal to use 'await' in a type context. diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction1_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction1_es6.ts index 45e686fd280..83e7413c527 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction1_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction1_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async (): Promise => { }; \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts index 8d792fdff9c..bf39735d460 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction2_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var f = (await) => { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts index 9ca200f8d76..4ae27c596f1 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction3_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true function f(await = await) { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction4_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction4_es6.ts index 4946592c45b..51b34abeca1 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction4_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction4_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var await = () => { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts index 53052368b31..174a619bdf9 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction5_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async (await): Promise => { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction6_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction6_es6.ts index 69768429ecf..dace96c4933 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction6_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction6_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async (a = await): Promise => { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction7_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction7_es6.ts index a034381ba57..b1fd5cc030d 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction7_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction7_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var bar = async (): Promise => { // 'await' here is an identifier, and not an await expression. diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction8_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction8_es6.ts index 397e06f703d..5d53338b1bd 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction8_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction8_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async (): Promise => { var v = { [await]: foo } diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts index 3f961c9d595..da041fe472b 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var foo = async (a = await => await): Promise => { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6.ts index f00d0d16545..8dab2c04086 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesArguments_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true class C { method() { function other() {} diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6.ts index a90f08cb9f7..f2c507cbdd6 100644 --- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6.ts +++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunctionCapturesThis_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true class C { method() { var fn = async () => await this; diff --git a/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts b/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts index 52694f24118..8e2cfd8c6c5 100644 --- a/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts +++ b/tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @isolatedModules: true -// @experimentalAsyncFunctions: true import { MyPromise } from "missing"; declare var p: Promise; diff --git a/tests/cases/conformance/async/es6/asyncAwait_es6.ts b/tests/cases/conformance/async/es6/asyncAwait_es6.ts index eee2e73d023..8e72197a98d 100644 --- a/tests/cases/conformance/async/es6/asyncAwait_es6.ts +++ b/tests/cases/conformance/async/es6/asyncAwait_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 -// @experimentalAsyncFunctions: true type MyPromise = Promise; declare var MyPromise: typeof Promise; declare var p: Promise; diff --git a/tests/cases/conformance/async/es6/asyncClass_es6.ts b/tests/cases/conformance/async/es6/asyncClass_es6.ts index c4a444ca909..22ffe997b03 100644 --- a/tests/cases/conformance/async/es6/asyncClass_es6.ts +++ b/tests/cases/conformance/async/es6/asyncClass_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async class C { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncConstructor_es6.ts b/tests/cases/conformance/async/es6/asyncConstructor_es6.ts index 998156f19f4..d769fad0395 100644 --- a/tests/cases/conformance/async/es6/asyncConstructor_es6.ts +++ b/tests/cases/conformance/async/es6/asyncConstructor_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true class C { async constructor() { } diff --git a/tests/cases/conformance/async/es6/asyncDeclare_es6.ts b/tests/cases/conformance/async/es6/asyncDeclare_es6.ts index d83c25a421a..5e0fb536b39 100644 --- a/tests/cases/conformance/async/es6/asyncDeclare_es6.ts +++ b/tests/cases/conformance/async/es6/asyncDeclare_es6.ts @@ -1,4 +1,3 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare async function foo(): Promise; \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncEnum_es6.ts b/tests/cases/conformance/async/es6/asyncEnum_es6.ts index d9569bef9d1..4fad7923a8c 100644 --- a/tests/cases/conformance/async/es6/asyncEnum_es6.ts +++ b/tests/cases/conformance/async/es6/asyncEnum_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async enum E { Value } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncGetter_es6.ts b/tests/cases/conformance/async/es6/asyncGetter_es6.ts index fe5751ece0b..79fde60fdc4 100644 --- a/tests/cases/conformance/async/es6/asyncGetter_es6.ts +++ b/tests/cases/conformance/async/es6/asyncGetter_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true class C { async get foo() { } diff --git a/tests/cases/conformance/async/es6/asyncInterface_es6.ts b/tests/cases/conformance/async/es6/asyncInterface_es6.ts index c7bb460ea2b..5d5497d3cd4 100644 --- a/tests/cases/conformance/async/es6/asyncInterface_es6.ts +++ b/tests/cases/conformance/async/es6/asyncInterface_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async interface I { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncModule_es6.ts b/tests/cases/conformance/async/es6/asyncModule_es6.ts index cf660d25d1f..aa4c295d0e3 100644 --- a/tests/cases/conformance/async/es6/asyncModule_es6.ts +++ b/tests/cases/conformance/async/es6/asyncModule_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async module M { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/asyncSetter_es6.ts b/tests/cases/conformance/async/es6/asyncSetter_es6.ts index 2ca1c805a45..8eedcbb5288 100644 --- a/tests/cases/conformance/async/es6/asyncSetter_es6.ts +++ b/tests/cases/conformance/async/es6/asyncSetter_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true class C { async set foo(value) { } diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts index df0d0e459d4..46060f309b2 100644 --- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts +++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; async function func(): Promise { diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts index 7678c4b17ab..362f1ecc446 100644 --- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts +++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; async function func(): Promise { diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts index 0b441f063dd..d3b02033252 100644 --- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts +++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: number; declare var p: Promise; async function func(): Promise { diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts index a0bdf58710f..eba3be31acf 100644 --- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts +++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; async function func(): Promise { diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts index 3276d24ee4b..71b173f9e73 100644 --- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts +++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; async function func(): Promise { diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts index 02de646112c..d0442f0968d 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts index 5d2e4046349..6de07ef12ff 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts index 702e1f4cbcc..2cc0b7b12d0 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts index aeeb192b4ba..8e349fbc5c3 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts index 82bb1f88ad2..bbe81ac94b1 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts index d5778df71ba..09e88f5acbc 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts index db01f34c825..fe0182da4aa 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts index b0b10a02a6f..e3280eb7c10 100644 --- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts +++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare var a: boolean; declare var p: Promise; declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void; diff --git a/tests/cases/conformance/async/es6/awaitUnion_es6.ts b/tests/cases/conformance/async/es6/awaitUnion_es6.ts index 59c5285556c..a132ae01dfd 100644 --- a/tests/cases/conformance/async/es6/awaitUnion_es6.ts +++ b/tests/cases/conformance/async/es6/awaitUnion_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare let a: number | string; declare let b: PromiseLike | PromiseLike; declare let c: PromiseLike; diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts index d543e424a38..aab1f0013ec 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(a = await => await): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts index 23e40a0e5ba..747d20d7ea8 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function await(): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts index a457d27073f..bbd77250365 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration12_es6.ts @@ -1,4 +1,3 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var v = async function await(): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts index 83b6a99579c..8670fa02811 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration13_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(): Promise { // Legal to use 'await' in a type context. var v: await; diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts index b837e6618d1..ba70c61b492 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(): Promise { return; } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts index 56bcf84911a..74018b73678 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true declare class Thenable { then(): void; } declare let a: any; declare let obj: { then: string; }; diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts index 3a792140011..289a65bb74f 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts index e75ef1d36a3..25a153b4a34 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration2_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true function f(await) { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts index 9ca200f8d76..4ae27c596f1 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration3_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true function f(await = await) { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6.ts index ac4447a0e4d..5d1ec389da3 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration4_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true function await() { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts index 60a0a8f4b74..eb3cd1db556 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration5_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(await): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration6_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration6_es6.ts index a3ab64b9d29..89b0445fd2e 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration6_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration6_es6.ts @@ -1,5 +1,4 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(a = await): Promise { } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts index cde12c7dbe3..5a964695da5 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration7_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function bar(): Promise { // 'await' here is an identifier, and not a yield expression. async function foo(a = await): Promise { diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts index 52b6dba2792..764b0f3fb8a 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration8_es6.ts @@ -1,4 +1,3 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true var v = { [await]: foo } \ No newline at end of file diff --git a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts index 662fa017606..7671764ad2a 100644 --- a/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts +++ b/tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration9_es6.ts @@ -1,6 +1,5 @@ // @target: ES6 // @noEmitHelpers: true -// @experimentalAsyncFunctions: true async function foo(): Promise { var v = { [await]: foo } } \ No newline at end of file From f952873ef10d2ad70b680fa773c4999fc0555193 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 12 Oct 2015 15:58:34 -0700 Subject: [PATCH 09/13] allow forward references to block scoped variables from functions --- src/compiler/checker.ts | 106 +++++++++++++----- .../blockScopedVariablesUseBeforeDef.js | 74 ++++++++++++ .../blockScopedVariablesUseBeforeDef.symbols | 76 +++++++++++++ .../blockScopedVariablesUseBeforeDef.types | 81 +++++++++++++ .../blockScopedVariablesUseBeforeDef.ts | 35 ++++++ 5 files changed, 341 insertions(+), 31 deletions(-) create mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.js create mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols create mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.types create mode 100644 tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ad772bd1a70..3eead9fc957 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -383,20 +383,42 @@ namespace ts { // return undefined if we can't find a symbol. } - /** Returns true if node1 is defined before node 2**/ - function isDefinedBefore(node1: Node, node2: Node): boolean { - let file1 = getSourceFileOfNode(node1); - let file2 = getSourceFileOfNode(node2); + const enum RelativeLocation { + Unknown, + SameFileLocatedBefore, + SameFileLocatedAfter, + DifferentFilesLocatedBefore, + DifferentFilesLocatedAfter, + } + + function isLocatedBefore(origin: Node, target: Node): boolean { + switch (getRelativeLocation(origin, target)) { + // unknown is returned with nodes are in different files and order cannot be determined based on compilation settings + // optimistically assume this is ok + case RelativeLocation.Unknown: + case RelativeLocation.SameFileLocatedBefore: + case RelativeLocation.DifferentFilesLocatedBefore: + return true; + default: + return false; + } + } + + /** gets relative location of target comparing to origin **/ + function getRelativeLocation(origin: Node, target: Node): RelativeLocation { + let file1 = getSourceFileOfNode(origin); + let file2 = getSourceFileOfNode(target); if (file1 === file2) { - return node1.pos <= node2.pos; + return origin.pos > target.pos ? RelativeLocation.SameFileLocatedBefore : RelativeLocation.SameFileLocatedAfter; } if (!compilerOptions.outFile && !compilerOptions.out) { - return true; + // nodes are in different files and order cannot be determines + return RelativeLocation.Unknown; } let sourceFiles = host.getSourceFiles(); - return sourceFiles.indexOf(file1) <= sourceFiles.indexOf(file2); + return sourceFiles.indexOf(file1) > sourceFiles.indexOf(file2) ? RelativeLocation.DifferentFilesLocatedBefore : RelativeLocation.DifferentFilesLocatedAfter; } // Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and @@ -628,31 +650,53 @@ namespace ts { Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); // first check if usage is lexically located after the declaration - let isUsedBeforeDeclaration = !isDefinedBefore(declaration, errorLocation); - if (!isUsedBeforeDeclaration) { - // lexical check succeeded however code still can be illegal. - // - block scoped variables cannot be used in its initializers - // let x = x; // illegal but usage is lexically after definition - // - in ForIn/ForOf statements variable cannot be contained in expression part - // for (let x in x) - // for (let x of x) + let isUsedBeforeDeclaration = false; + switch (getRelativeLocation(declaration, errorLocation)) { + case RelativeLocation.DifferentFilesLocatedBefore: + isUsedBeforeDeclaration = true; + break; + case RelativeLocation.SameFileLocatedBefore: + // try to detect if forward reference to block scoped variable is inside function + // such forward references are permitted (they are still technically can be incorrect (i.e. in case of IIFEs) + // but detecting these case is more complicated task) + const declarationContainer = getEnclosingBlockScopeContainer(declaration); + let current = errorLocation; + while (current) { + if (current === declarationContainer) { + isUsedBeforeDeclaration = true; + break; + } + else if (isFunctionLike(current)) { + break; + } + current = current.parent; + } + break; + case RelativeLocation.SameFileLocatedAfter: + // lexical check succeeded however code still can be illegal. + // - block scoped variables cannot be used in its initializers + // let x = x; // illegal but usage is lexically after definition + // - in ForIn/ForOf statements variable cannot be contained in expression part + // for (let x in x) + // for (let x of x) - // climb up to the variable declaration skipping binding patterns - let variableDeclaration = getAncestor(declaration, SyntaxKind.VariableDeclaration); - let container = getEnclosingBlockScopeContainer(variableDeclaration); + // climb up to the variable declaration skipping binding patterns + let variableDeclaration = getAncestor(declaration, SyntaxKind.VariableDeclaration); + let container = getEnclosingBlockScopeContainer(variableDeclaration); - if (variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement || - variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement) { - // variable statement/for statement case, - // use site should not be inside variable declaration (initializer of declaration or binding element) - isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container); - } - else if (variableDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement || - variableDeclaration.parent.parent.kind === SyntaxKind.ForInStatement) { - // ForIn/ForOf case - use site should not be used in expression part - let expression = (variableDeclaration.parent.parent).expression; - isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container); - } + if (variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement || + variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement) { + // variable statement/for statement case, + // use site should not be inside variable declaration (initializer of declaration or binding element) + isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container); + } + else if (variableDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement || + variableDeclaration.parent.parent.kind === SyntaxKind.ForInStatement) { + // ForIn/ForOf case - use site should not be used in expression part + let expression = (variableDeclaration.parent.parent).expression; + isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container); + } + break; } if (isUsedBeforeDeclaration) { error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationNameToString(declaration.name)); @@ -13356,7 +13400,7 @@ namespace ts { } // illegal case: forward reference - if (!isDefinedBefore(propertyDecl, member)) { + if (isLocatedBefore(propertyDecl, member)) { reportError = false; error(e, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums); return undefined; diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js new file mode 100644 index 00000000000..2792521344f --- /dev/null +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js @@ -0,0 +1,74 @@ +//// [blockScopedVariablesUseBeforeDef.ts] +function foo1() { + let a = () => x; + let x; +} + +function foo2() { + let a = function () { return x; } + let x; +} + +function foo3() { + class X { + m() { return x;} + } + let x; +} + +function foo4() { + let y = class { + m() { return x; } + }; + let x; +} + +function foo5() { + let x = () => y; + let y = () => x; +} + +function foo6() { + function f() { + return x; + } + let x; +} + +//// [blockScopedVariablesUseBeforeDef.js] +function foo1() { + var a = function () { return x; }; + var x; +} +function foo2() { + var a = function () { return x; }; + var x; +} +function foo3() { + var X = (function () { + function X() { + } + X.prototype.m = function () { return x; }; + return X; + })(); + var x; +} +function foo4() { + var y = (function () { + function class_1() { + } + class_1.prototype.m = function () { return x; }; + return class_1; + })(); + var x; +} +function foo5() { + var x = function () { return y; }; + var y = function () { return x; }; +} +function foo6() { + function f() { + return x; + } + var x; +} diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols new file mode 100644 index 00000000000..a528af236c1 --- /dev/null +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols @@ -0,0 +1,76 @@ +=== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts === +function foo1() { +>foo1 : Symbol(foo1, Decl(blockScopedVariablesUseBeforeDef.ts, 0, 0)) + + let a = () => x; +>a : Symbol(a, Decl(blockScopedVariablesUseBeforeDef.ts, 1, 4)) +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 2, 4)) + + let x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 2, 4)) +} + +function foo2() { +>foo2 : Symbol(foo2, Decl(blockScopedVariablesUseBeforeDef.ts, 3, 1)) + + let a = function () { return x; } +>a : Symbol(a, Decl(blockScopedVariablesUseBeforeDef.ts, 6, 4)) +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 7, 4)) + + let x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 7, 4)) +} + +function foo3() { +>foo3 : Symbol(foo3, Decl(blockScopedVariablesUseBeforeDef.ts, 8, 1)) + + class X { +>X : Symbol(X, Decl(blockScopedVariablesUseBeforeDef.ts, 10, 17)) + + m() { return x;} +>m : Symbol(m, Decl(blockScopedVariablesUseBeforeDef.ts, 11, 10)) +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 14, 4)) + } + let x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 14, 4)) +} + +function foo4() { +>foo4 : Symbol(foo4, Decl(blockScopedVariablesUseBeforeDef.ts, 15, 1)) + + let y = class { +>y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 18, 4)) + + m() { return x; } +>m : Symbol((Anonymous class).m, Decl(blockScopedVariablesUseBeforeDef.ts, 18, 16)) +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 21, 4)) + + }; + let x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 21, 4)) +} + +function foo5() { +>foo5 : Symbol(foo5, Decl(blockScopedVariablesUseBeforeDef.ts, 22, 1)) + + let x = () => y; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 25, 4)) +>y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 26, 4)) + + let y = () => x; +>y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 26, 4)) +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 25, 4)) +} + +function foo6() { +>foo6 : Symbol(foo6, Decl(blockScopedVariablesUseBeforeDef.ts, 27, 1)) + + function f() { +>f : Symbol(f, Decl(blockScopedVariablesUseBeforeDef.ts, 29, 17)) + + return x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 33, 4)) + } + let x; +>x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 33, 4)) +} diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types new file mode 100644 index 00000000000..bc3d5f8eba8 --- /dev/null +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types @@ -0,0 +1,81 @@ +=== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts === +function foo1() { +>foo1 : () => void + + let a = () => x; +>a : () => any +>() => x : () => any +>x : any + + let x; +>x : any +} + +function foo2() { +>foo2 : () => void + + let a = function () { return x; } +>a : () => any +>function () { return x; } : () => any +>x : any + + let x; +>x : any +} + +function foo3() { +>foo3 : () => void + + class X { +>X : X + + m() { return x;} +>m : () => any +>x : any + } + let x; +>x : any +} + +function foo4() { +>foo4 : () => void + + let y = class { +>y : typeof (Anonymous class) +>class { m() { return x; } } : typeof (Anonymous class) + + m() { return x; } +>m : () => any +>x : any + + }; + let x; +>x : any +} + +function foo5() { +>foo5 : () => void + + let x = () => y; +>x : () => () => any +>() => y : () => () => any +>y : () => () => any + + let y = () => x; +>y : () => () => any +>() => x : () => () => any +>x : () => () => any +} + +function foo6() { +>foo6 : () => void + + function f() { +>f : () => any + + return x; +>x : any + } + let x; +>x : any +} diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts new file mode 100644 index 00000000000..7ded92df4c9 --- /dev/null +++ b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts @@ -0,0 +1,35 @@ +function foo1() { + let a = () => x; + let x; +} + +function foo2() { + let a = function () { return x; } + let x; +} + +function foo3() { + class X { + m() { return x;} + } + let x; +} + +function foo4() { + let y = class { + m() { return x; } + }; + let x; +} + +function foo5() { + let x = () => y; + let y = () => x; +} + +function foo6() { + function f() { + return x; + } + let x; +} \ No newline at end of file From eb3b91cf1b1e681eac27c9b650830b8c3c978cd6 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 12 Oct 2015 17:24:39 -0700 Subject: [PATCH 10/13] addressed PR feedback --- src/compiler/checker.ts | 15 +- ...lockScopedVariablesUseBeforeDef.errors.txt | 93 ++++++++++++ .../blockScopedVariablesUseBeforeDef.js | 143 +++++++++++++++--- .../blockScopedVariablesUseBeforeDef.symbols | 76 ---------- .../blockScopedVariablesUseBeforeDef.types | 81 ---------- ...clarations-useBeforeDefinition2.errors.txt | 11 -- ...tDeclarations-useBeforeDefinition2.symbols | 9 ++ ...nstDeclarations-useBeforeDefinition2.types | 10 ++ ...clarations-useBeforeDefinition2.errors.txt | 11 -- ...tDeclarations-useBeforeDefinition2.symbols | 9 ++ ...letDeclarations-useBeforeDefinition2.types | 10 ++ .../blockScopedVariablesUseBeforeDef.ts | 85 ++++++++--- 12 files changed, 336 insertions(+), 217 deletions(-) create mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt delete mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols delete mode 100644 tests/baselines/reference/blockScopedVariablesUseBeforeDef.types delete mode 100644 tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt create mode 100644 tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols create mode 100644 tests/baselines/reference/constDeclarations-useBeforeDefinition2.types delete mode 100644 tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt create mode 100644 tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols create mode 100644 tests/baselines/reference/letDeclarations-useBeforeDefinition2.types diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3eead9fc957..0213f594f5b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -412,7 +412,7 @@ namespace ts { return origin.pos > target.pos ? RelativeLocation.SameFileLocatedBefore : RelativeLocation.SameFileLocatedAfter; } - if (!compilerOptions.outFile && !compilerOptions.out) { + if (modulekind || (!compilerOptions.outFile && !compilerOptions.out)) { // nodes are in different files and order cannot be determines return RelativeLocation.Unknown; } @@ -666,7 +666,18 @@ namespace ts { isUsedBeforeDeclaration = true; break; } - else if (isFunctionLike(current)) { + + if (isFunctionLike(current)) { + break; + } + + const isInitializerOfNonStaticProperty = + current.parent && + current.parent.kind === SyntaxKind.PropertyDeclaration && + (current.parent.flags & NodeFlags.Static) === 0 && + (current.parent).initializer === current; + + if (isInitializerOfNonStaticProperty) { break; } current = current.parent; diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt new file mode 100644 index 00000000000..a2bae3307a1 --- /dev/null +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt @@ -0,0 +1,93 @@ +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(53,20): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(60,20): error TS2448: Block-scoped variable 'x' used before its declaration. + + +==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (2 errors) ==== + function foo1() { + let a = () => x; + let x; + } + + function foo2() { + let a = function () { return x; } + let x; + } + + function foo3() { + class X { + m() { return x;} + } + let x; + } + + function foo4() { + let y = class { + m() { return x; } + }; + let x; + } + + function foo5() { + let x = () => y; + let y = () => x; + } + + function foo6() { + function f() { + return x; + } + let x; + } + + function foo7() { + class A { + a = x; + } + let x; + } + + function foo8() { + let y = class { + a = x; + } + let x; + } + + function foo9() { + let y = class { + static a = x; + ~ +!!! error TS2448: Block-scoped variable 'x' used before its declaration. + } + let x; + } + + function foo10() { + class A { + static a = x; + ~ +!!! error TS2448: Block-scoped variable 'x' used before its declaration. + } + let x; + } + + function foo11() { + function f () { + let y = class { + static a = x; + } + } + let x; + } + + function foo12() { + function f () { + let y = class { + a; + constructor() { + this.a = x; + } + } + } + let x; + } \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js index 2792521344f..212b9d8b7b8 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js @@ -1,38 +1,87 @@ //// [blockScopedVariablesUseBeforeDef.ts] function foo1() { - let a = () => x; - let x; + let a = () => x; + let x; } function foo2() { - let a = function () { return x; } - let x; + let a = function () { return x; } + let x; } function foo3() { - class X { - m() { return x;} - } - let x; + class X { + m() { return x;} + } + let x; } function foo4() { - let y = class { - m() { return x; } - }; - let x; + let y = class { + m() { return x; } + }; + let x; } function foo5() { - let x = () => y; - let y = () => x; + let x = () => y; + let y = () => x; } function foo6() { - function f() { - return x; - } - let x; + function f() { + return x; + } + let x; +} + +function foo7() { + class A { + a = x; + } + let x; +} + +function foo8() { + let y = class { + a = x; + } + let x; +} + +function foo9() { + let y = class { + static a = x; + } + let x; +} + +function foo10() { + class A { + static a = x; + } + let x; +} + +function foo11() { + function f () { + let y = class { + static a = x; + } + } + let x; +} + +function foo12() { + function f () { + let y = class { + a; + constructor() { + this.a = x; + } + } + } + let x; } //// [blockScopedVariablesUseBeforeDef.js] @@ -72,3 +121,61 @@ function foo6() { } var x; } +function foo7() { + var A = (function () { + function A() { + this.a = x; + } + return A; + })(); + var x; +} +function foo8() { + var y = (function () { + function class_2() { + this.a = x; + } + return class_2; + })(); + var x; +} +function foo9() { + var y = (function () { + function class_3() { + } + class_3.a = x; + return class_3; + })(); + var x; +} +function foo10() { + var A = (function () { + function A() { + } + A.a = x; + return A; + })(); + var x; +} +function foo11() { + function f() { + var y = (function () { + function class_4() { + } + class_4.a = x; + return class_4; + })(); + } + var x; +} +function foo12() { + function f() { + var y = (function () { + function class_5() { + this.a = x; + } + return class_5; + })(); + } + var x; +} diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols deleted file mode 100644 index a528af236c1..00000000000 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.symbols +++ /dev/null @@ -1,76 +0,0 @@ -=== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts === -function foo1() { ->foo1 : Symbol(foo1, Decl(blockScopedVariablesUseBeforeDef.ts, 0, 0)) - - let a = () => x; ->a : Symbol(a, Decl(blockScopedVariablesUseBeforeDef.ts, 1, 4)) ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 2, 4)) - - let x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 2, 4)) -} - -function foo2() { ->foo2 : Symbol(foo2, Decl(blockScopedVariablesUseBeforeDef.ts, 3, 1)) - - let a = function () { return x; } ->a : Symbol(a, Decl(blockScopedVariablesUseBeforeDef.ts, 6, 4)) ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 7, 4)) - - let x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 7, 4)) -} - -function foo3() { ->foo3 : Symbol(foo3, Decl(blockScopedVariablesUseBeforeDef.ts, 8, 1)) - - class X { ->X : Symbol(X, Decl(blockScopedVariablesUseBeforeDef.ts, 10, 17)) - - m() { return x;} ->m : Symbol(m, Decl(blockScopedVariablesUseBeforeDef.ts, 11, 10)) ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 14, 4)) - } - let x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 14, 4)) -} - -function foo4() { ->foo4 : Symbol(foo4, Decl(blockScopedVariablesUseBeforeDef.ts, 15, 1)) - - let y = class { ->y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 18, 4)) - - m() { return x; } ->m : Symbol((Anonymous class).m, Decl(blockScopedVariablesUseBeforeDef.ts, 18, 16)) ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 21, 4)) - - }; - let x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 21, 4)) -} - -function foo5() { ->foo5 : Symbol(foo5, Decl(blockScopedVariablesUseBeforeDef.ts, 22, 1)) - - let x = () => y; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 25, 4)) ->y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 26, 4)) - - let y = () => x; ->y : Symbol(y, Decl(blockScopedVariablesUseBeforeDef.ts, 26, 4)) ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 25, 4)) -} - -function foo6() { ->foo6 : Symbol(foo6, Decl(blockScopedVariablesUseBeforeDef.ts, 27, 1)) - - function f() { ->f : Symbol(f, Decl(blockScopedVariablesUseBeforeDef.ts, 29, 17)) - - return x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 33, 4)) - } - let x; ->x : Symbol(x, Decl(blockScopedVariablesUseBeforeDef.ts, 33, 4)) -} diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types deleted file mode 100644 index bc3d5f8eba8..00000000000 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.types +++ /dev/null @@ -1,81 +0,0 @@ -=== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts === -function foo1() { ->foo1 : () => void - - let a = () => x; ->a : () => any ->() => x : () => any ->x : any - - let x; ->x : any -} - -function foo2() { ->foo2 : () => void - - let a = function () { return x; } ->a : () => any ->function () { return x; } : () => any ->x : any - - let x; ->x : any -} - -function foo3() { ->foo3 : () => void - - class X { ->X : X - - m() { return x;} ->m : () => any ->x : any - } - let x; ->x : any -} - -function foo4() { ->foo4 : () => void - - let y = class { ->y : typeof (Anonymous class) ->class { m() { return x; } } : typeof (Anonymous class) - - m() { return x; } ->m : () => any ->x : any - - }; - let x; ->x : any -} - -function foo5() { ->foo5 : () => void - - let x = () => y; ->x : () => () => any ->() => y : () => () => any ->y : () => () => any - - let y = () => x; ->y : () => () => any ->() => x : () => () => any ->x : () => () => any -} - -function foo6() { ->foo6 : () => void - - function f() { ->f : () => any - - return x; ->x : any - } - let x; ->x : any -} diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt deleted file mode 100644 index a4d28f51878..00000000000 --- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -tests/cases/compiler/file1.ts(2,1): error TS2448: Block-scoped variable 'c' used before its declaration. - - -==== tests/cases/compiler/file1.ts (1 errors) ==== - - c; - ~ -!!! error TS2448: Block-scoped variable 'c' used before its declaration. - -==== tests/cases/compiler/file2.ts (0 errors) ==== - const c = 0; \ No newline at end of file diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols new file mode 100644 index 00000000000..281ce427733 --- /dev/null +++ b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/file1.ts === + +c; +>c : Symbol(c, Decl(file2.ts, 0, 5)) + +=== tests/cases/compiler/file2.ts === +const c = 0; +>c : Symbol(c, Decl(file2.ts, 0, 5)) + diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types new file mode 100644 index 00000000000..ae60fdfa477 --- /dev/null +++ b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/file1.ts === + +c; +>c : number + +=== tests/cases/compiler/file2.ts === +const c = 0; +>c : number +>0 : number + diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt deleted file mode 100644 index 5b8633312d9..00000000000 --- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -tests/cases/compiler/file1.ts(2,1): error TS2448: Block-scoped variable 'l' used before its declaration. - - -==== tests/cases/compiler/file1.ts (1 errors) ==== - - l; - ~ -!!! error TS2448: Block-scoped variable 'l' used before its declaration. - -==== tests/cases/compiler/file2.ts (0 errors) ==== - const l = 0; \ No newline at end of file diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols new file mode 100644 index 00000000000..c5a067ede4d --- /dev/null +++ b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/file1.ts === + +l; +>l : Symbol(l, Decl(file2.ts, 0, 5)) + +=== tests/cases/compiler/file2.ts === +const l = 0; +>l : Symbol(l, Decl(file2.ts, 0, 5)) + diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types new file mode 100644 index 00000000000..793a7a78ba7 --- /dev/null +++ b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/file1.ts === + +l; +>l : number + +=== tests/cases/compiler/file2.ts === +const l = 0; +>l : number +>0 : number + diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts index 7ded92df4c9..287f5ae117e 100644 --- a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts +++ b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts @@ -1,35 +1,84 @@ function foo1() { - let a = () => x; - let x; + let a = () => x; + let x; } function foo2() { - let a = function () { return x; } - let x; + let a = function () { return x; } + let x; } function foo3() { - class X { - m() { return x;} - } - let x; + class X { + m() { return x;} + } + let x; } function foo4() { - let y = class { - m() { return x; } - }; - let x; + let y = class { + m() { return x; } + }; + let x; } function foo5() { - let x = () => y; - let y = () => x; + let x = () => y; + let y = () => x; } function foo6() { - function f() { - return x; - } - let x; + function f() { + return x; + } + let x; +} + +function foo7() { + class A { + a = x; + } + let x; +} + +function foo8() { + let y = class { + a = x; + } + let x; +} + +function foo9() { + let y = class { + static a = x; + } + let x; +} + +function foo10() { + class A { + static a = x; + } + let x; +} + +function foo11() { + function f () { + let y = class { + static a = x; + } + } + let x; +} + +function foo12() { + function f () { + let y = class { + a; + constructor() { + this.a = x; + } + } + } + let x; } \ No newline at end of file From 48b24343b19769c175796a5fa9f769cf2bf44f1d Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 13 Oct 2015 00:06:59 -0700 Subject: [PATCH 11/13] use isBlockScopedNameDeclaredBeforeUse for block scoped variables and enums --- src/compiler/checker.ts | 159 +++++++----------- ...lockScopedVariablesUseBeforeDef.errors.txt | 45 ++++- .../blockScopedVariablesUseBeforeDef.js | 48 +++++- .../blockScopedVariablesUseBeforeDef.ts | 31 +++- 4 files changed, 183 insertions(+), 100 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0213f594f5b..9db3d49b9af 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -383,42 +383,72 @@ namespace ts { // return undefined if we can't find a symbol. } - const enum RelativeLocation { - Unknown, - SameFileLocatedBefore, - SameFileLocatedAfter, - DifferentFilesLocatedBefore, - DifferentFilesLocatedAfter, - } - - function isLocatedBefore(origin: Node, target: Node): boolean { - switch (getRelativeLocation(origin, target)) { - // unknown is returned with nodes are in different files and order cannot be determined based on compilation settings - // optimistically assume this is ok - case RelativeLocation.Unknown: - case RelativeLocation.SameFileLocatedBefore: - case RelativeLocation.DifferentFilesLocatedBefore: + function isBlockScopedNameDeclaredBeforeUse(declaration: Declaration, usage: Node): boolean { + const declarationFile = getSourceFileOfNode(declaration); + const useFile = getSourceFileOfNode(usage); + if (declarationFile !== useFile) { + if (modulekind || (!compilerOptions.outFile && !compilerOptions.out)) { + // nodes are in different files and order cannot be determines return true; - default: - return false; - } - } + } - /** gets relative location of target comparing to origin **/ - function getRelativeLocation(origin: Node, target: Node): RelativeLocation { - let file1 = getSourceFileOfNode(origin); - let file2 = getSourceFileOfNode(target); - if (file1 === file2) { - return origin.pos > target.pos ? RelativeLocation.SameFileLocatedBefore : RelativeLocation.SameFileLocatedAfter; + const sourceFiles = host.getSourceFiles(); + return indexOf(sourceFiles, declarationFile) <= indexOf(sourceFiles, useFile); } - if (modulekind || (!compilerOptions.outFile && !compilerOptions.out)) { - // nodes are in different files and order cannot be determines - return RelativeLocation.Unknown; + if (declaration.pos <= usage.pos) { + // declaration is before usage + // still might be illegal if usage is in the initializer of the variable declaration + return declaration.kind !== SyntaxKind.VariableDeclaration || + !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage); } - let sourceFiles = host.getSourceFiles(); - return sourceFiles.indexOf(file1) > sourceFiles.indexOf(file2) ? RelativeLocation.DifferentFilesLocatedBefore : RelativeLocation.DifferentFilesLocatedAfter; + // declaration is after usage + // can be legal if usage is deferred (i.e. inside function or in initializer of instance property) + return isUsedInFunctionOrNonStaticProperty(declaration, usage); + + function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration: VariableDeclaration, usage: Node): boolean { + const container = getEnclosingBlockScopeContainer(declaration); + + if (declaration.parent.parent.kind === SyntaxKind.VariableStatement || + declaration.parent.parent.kind === SyntaxKind.ForStatement) { + // variable statement/for statement case, + // use site should not be inside variable declaration (initializer of declaration or binding element) + return isSameScopeDescendentOf(usage, declaration, container); + } + else if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement || + declaration.parent.parent.kind === SyntaxKind.ForInStatement) { + // ForIn/ForOf case - use site should not be used in expression part + let expression = (declaration.parent.parent).expression; + return isSameScopeDescendentOf(usage, expression, container); + } + } + + function isUsedInFunctionOrNonStaticProperty(declaration: Declaration, usage: Node): boolean { + const container = getEnclosingBlockScopeContainer(declaration); + let current = usage; + while (current) { + if (current === container) { + return false; + } + + if (isFunctionLike(current)) { + return true; + } + + const initializerOfNonStaticProperty = current.parent && + current.parent.kind === SyntaxKind.PropertyDeclaration && + (current.parent.flags & NodeFlags.Static) === 0 && + (current.parent).initializer === current; + + if (initializerOfNonStaticProperty) { + return true; + } + + current = current.parent; + } + return false; + } } // Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and @@ -649,67 +679,7 @@ namespace ts { Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined"); - // first check if usage is lexically located after the declaration - let isUsedBeforeDeclaration = false; - switch (getRelativeLocation(declaration, errorLocation)) { - case RelativeLocation.DifferentFilesLocatedBefore: - isUsedBeforeDeclaration = true; - break; - case RelativeLocation.SameFileLocatedBefore: - // try to detect if forward reference to block scoped variable is inside function - // such forward references are permitted (they are still technically can be incorrect (i.e. in case of IIFEs) - // but detecting these case is more complicated task) - const declarationContainer = getEnclosingBlockScopeContainer(declaration); - let current = errorLocation; - while (current) { - if (current === declarationContainer) { - isUsedBeforeDeclaration = true; - break; - } - - if (isFunctionLike(current)) { - break; - } - - const isInitializerOfNonStaticProperty = - current.parent && - current.parent.kind === SyntaxKind.PropertyDeclaration && - (current.parent.flags & NodeFlags.Static) === 0 && - (current.parent).initializer === current; - - if (isInitializerOfNonStaticProperty) { - break; - } - current = current.parent; - } - break; - case RelativeLocation.SameFileLocatedAfter: - // lexical check succeeded however code still can be illegal. - // - block scoped variables cannot be used in its initializers - // let x = x; // illegal but usage is lexically after definition - // - in ForIn/ForOf statements variable cannot be contained in expression part - // for (let x in x) - // for (let x of x) - - // climb up to the variable declaration skipping binding patterns - let variableDeclaration = getAncestor(declaration, SyntaxKind.VariableDeclaration); - let container = getEnclosingBlockScopeContainer(variableDeclaration); - - if (variableDeclaration.parent.parent.kind === SyntaxKind.VariableStatement || - variableDeclaration.parent.parent.kind === SyntaxKind.ForStatement) { - // variable statement/for statement case, - // use site should not be inside variable declaration (initializer of declaration or binding element) - isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, variableDeclaration, container); - } - else if (variableDeclaration.parent.parent.kind === SyntaxKind.ForOfStatement || - variableDeclaration.parent.parent.kind === SyntaxKind.ForInStatement) { - // ForIn/ForOf case - use site should not be used in expression part - let expression = (variableDeclaration.parent.parent).expression; - isUsedBeforeDeclaration = isSameScopeDescendentOf(errorLocation, expression, container); - } - break; - } - if (isUsedBeforeDeclaration) { + if (!isBlockScopedNameDeclaredBeforeUse(getAncestor(declaration, SyntaxKind.VariableDeclaration), errorLocation)) { error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationNameToString(declaration.name)); } } @@ -13233,6 +13203,8 @@ namespace ts { let nodeLinks = getNodeLinks(node); if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) { + nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed; + let enumSymbol = getSymbolOfNode(node); let enumType = getDeclaredTypeOfSymbol(enumSymbol); let autoValue = 0; // set to undefined when enum member is non-constant @@ -13270,8 +13242,6 @@ namespace ts { getNodeLinks(member).enumMemberValue = autoValue++; } } - - nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed; } function computeConstantValueForEnumMemberInitializer(initializer: Expression, enumType: Type, enumIsConst: boolean, ambient: boolean): number { @@ -13411,12 +13381,13 @@ namespace ts { } // illegal case: forward reference - if (isLocatedBefore(propertyDecl, member)) { + if (!isBlockScopedNameDeclaredBeforeUse(propertyDecl, member)) { reportError = false; error(e, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums); return undefined; } + computeEnumMemberValues(propertyDecl.parent); return getNodeLinks(propertyDecl).enumMemberValue; } } diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt index a2bae3307a1..15697e9cf61 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt @@ -1,8 +1,18 @@ -tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(53,20): error TS2448: Block-scoped variable 'x' used before its declaration. -tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(60,20): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(2,13): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(58,20): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(65,20): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(100,12): error TS2448: Block-scoped variable 'x' used before its declaration. +tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(105,20): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums. -==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (2 errors) ==== +==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (5 errors) ==== + function foo0() { + let a = x; + ~ +!!! error TS2448: Block-scoped variable 'x' used before its declaration. + let x; + } + function foo1() { let a = () => x; let x; @@ -90,4 +100,31 @@ tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(60,20): error TS2448: B } } let x; - } \ No newline at end of file + } + + function foo13() { + let a = { + get a() { return x } + } + let x + } + + function foo14() { + let a = { + a: x + ~ +!!! error TS2448: Block-scoped variable 'x' used before its declaration. + } + let x + } + + const enum A { X = B.Y } + ~~~ +!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums. + + const enum B { Y } + + function foo15() { + const enum A1 { X = B1.Y } + } + const enum B1 { Y } \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js index 212b9d8b7b8..2030b0eed59 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js @@ -1,4 +1,9 @@ //// [blockScopedVariablesUseBeforeDef.ts] +function foo0() { + let a = x; + let x; +} + function foo1() { let a = () => x; let x; @@ -82,9 +87,36 @@ function foo12() { } } let x; -} +} + +function foo13() { + let a = { + get a() { return x } + } + let x +} + +function foo14() { + let a = { + a: x + } + let x +} + +const enum A { X = B.Y } + +const enum B { Y } + +function foo15() { + const enum A1 { X = B1.Y } +} +const enum B1 { Y } //// [blockScopedVariablesUseBeforeDef.js] +function foo0() { + var a = x; + var x; +} function foo1() { var a = function () { return x; }; var x; @@ -179,3 +211,17 @@ function foo12() { } var x; } +function foo13() { + var a = { + get a() { return x; } + }; + var x; +} +function foo14() { + var a = { + a: x + }; + var x; +} +function foo15() { +} diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts index 287f5ae117e..1cade31d238 100644 --- a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts +++ b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts @@ -1,3 +1,9 @@ +// @target: ES5 +function foo0() { + let a = x; + let x; +} + function foo1() { let a = () => x; let x; @@ -81,4 +87,27 @@ function foo12() { } } let x; -} \ No newline at end of file +} + +function foo13() { + let a = { + get a() { return x } + } + let x +} + +function foo14() { + let a = { + a: x + } + let x +} + +const enum A { X = B.Y } + +const enum B { Y } + +function foo15() { + const enum A1 { X = B1.Y } +} +const enum B1 { Y } \ No newline at end of file From 6bbfe56dca0aa814af957bc46763cf87c3f86f48 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 13 Oct 2015 13:16:44 -0700 Subject: [PATCH 12/13] Use `memberListCount` --- tests/cases/fourslash/tsxCompletion10.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/cases/fourslash/tsxCompletion10.ts b/tests/cases/fourslash/tsxCompletion10.ts index cf8b3068f10..f10e014c282 100644 --- a/tests/cases/fourslash/tsxCompletion10.ts +++ b/tests/cases/fourslash/tsxCompletion10.ts @@ -10,6 +10,5 @@ //// var x1 =
Date: Tue, 13 Oct 2015 13:18:58 -0700 Subject: [PATCH 13/13] revert enum related changes --- src/compiler/checker.ts | 5 ++--- .../blockScopedVariablesUseBeforeDef.errors.txt | 16 ++-------------- .../blockScopedVariablesUseBeforeDef.js | 13 +------------ .../compiler/blockScopedVariablesUseBeforeDef.ts | 11 +---------- 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9db3d49b9af..db9661289bd 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -13203,8 +13203,6 @@ namespace ts { let nodeLinks = getNodeLinks(node); if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) { - nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed; - let enumSymbol = getSymbolOfNode(node); let enumType = getDeclaredTypeOfSymbol(enumSymbol); let autoValue = 0; // set to undefined when enum member is non-constant @@ -13242,6 +13240,8 @@ namespace ts { getNodeLinks(member).enumMemberValue = autoValue++; } } + + nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed; } function computeConstantValueForEnumMemberInitializer(initializer: Expression, enumType: Type, enumIsConst: boolean, ambient: boolean): number { @@ -13387,7 +13387,6 @@ namespace ts { return undefined; } - computeEnumMemberValues(propertyDecl.parent); return getNodeLinks(propertyDecl).enumMemberValue; } } diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt index 15697e9cf61..94c58bccb04 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt @@ -2,10 +2,9 @@ tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(2,13): error TS2448: Bl tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(58,20): error TS2448: Block-scoped variable 'x' used before its declaration. tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(65,20): error TS2448: Block-scoped variable 'x' used before its declaration. tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(100,12): error TS2448: Block-scoped variable 'x' used before its declaration. -tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(105,20): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums. -==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (5 errors) ==== +==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (4 errors) ==== function foo0() { let a = x; ~ @@ -116,15 +115,4 @@ tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(105,20): error TS2651: !!! error TS2448: Block-scoped variable 'x' used before its declaration. } let x - } - - const enum A { X = B.Y } - ~~~ -!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums. - - const enum B { Y } - - function foo15() { - const enum A1 { X = B1.Y } - } - const enum B1 { Y } \ No newline at end of file + } \ No newline at end of file diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js index 2030b0eed59..5ed3ac62e6a 100644 --- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js +++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js @@ -101,16 +101,7 @@ function foo14() { a: x } let x -} - -const enum A { X = B.Y } - -const enum B { Y } - -function foo15() { - const enum A1 { X = B1.Y } -} -const enum B1 { Y } +} //// [blockScopedVariablesUseBeforeDef.js] function foo0() { @@ -223,5 +214,3 @@ function foo14() { }; var x; } -function foo15() { -} diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts index 1cade31d238..956705bd7d3 100644 --- a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts +++ b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts @@ -101,13 +101,4 @@ function foo14() { a: x } let x -} - -const enum A { X = B.Y } - -const enum B { Y } - -function foo15() { - const enum A1 { X = B1.Y } -} -const enum B1 { Y } \ No newline at end of file +} \ No newline at end of file