From af731e0700cc877c5f2397e6e6c02c8ee3e4247c Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 29 Mar 2017 08:52:00 -0700 Subject: [PATCH] Update baselines from merging with master --- .../reference/ES5For-ofTypeCheck10.errors.txt | 5 +- .../reference/ES5For-ofTypeCheck10.js | 1 - .../reference/checkJsFiles.errors.txt | 3 +- .../reference/checkJsFiles2.errors.txt | 3 +- .../reference/checkJsFiles3.errors.txt | 3 +- .../reference/checkJsFiles4.errors.txt | 3 +- .../baselines/reference/checkJsFiles5.symbols | 5 +- tests/baselines/reference/checkJsFiles5.types | 1 - .../reference/checkJsFiles6.errors.txt | 1 - .../checkJsFiles_skipDiagnostics.symbols | 13 ++- .../checkJsFiles_skipDiagnostics.types | 1 - ...5ExportDefaultClassDeclaration3.errors.txt | 3 +- .../reference/exportImport.errors.txt | 5 +- .../reference/generatorTypeCheck62.js | 1 - .../reference/generatorTypeCheck62.symbols | 99 +++++++++---------- .../reference/generatorTypeCheck62.types | 1 - .../reference/generatorTypeCheck63.errors.txt | 9 +- .../reference/generatorTypeCheck63.js | 1 - .../reference/indexedAccessRelation.js | 2 +- tests/baselines/reference/tsxSfcReturnNull.js | 1 - .../reference/tsxSfcReturnNull.symbols | 19 ++-- .../reference/tsxSfcReturnNull.types | 1 - .../tsxSfcReturnNullStrictNullChecks.js | 1 - .../tsxSfcReturnNullStrictNullChecks.symbols | 19 ++-- .../tsxSfcReturnNullStrictNullChecks.types | 1 - ...ReturnUndefinedStrictNullChecks.errors.txt | 5 +- .../tsxSfcReturnUndefinedStrictNullChecks.js | 1 - 27 files changed, 91 insertions(+), 117 deletions(-) diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt b/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt index 7839958ba54..e608378d7f1 100644 --- a/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt +++ b/tests/baselines/reference/ES5For-ofTypeCheck10.errors.txt @@ -1,9 +1,8 @@ -tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(10,6): error TS2304: Cannot find name 'Symbol'. -tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(15,15): error TS2495: Type 'StringIterator' is not an array type or a string type. +tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(9,6): error TS2304: Cannot find name 'Symbol'. +tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts(14,15): error TS2495: Type 'StringIterator' is not an array type or a string type. ==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck10.ts (2 errors) ==== - // In ES3/5, you cannot for...of over an arbitrary iterable. class StringIterator { next() { diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.js b/tests/baselines/reference/ES5For-ofTypeCheck10.js index 9b197c2d206..c4cfafe5199 100644 --- a/tests/baselines/reference/ES5For-ofTypeCheck10.js +++ b/tests/baselines/reference/ES5For-ofTypeCheck10.js @@ -1,5 +1,4 @@ //// [ES5For-ofTypeCheck10.ts] - // In ES3/5, you cannot for...of over an arbitrary iterable. class StringIterator { next() { diff --git a/tests/baselines/reference/checkJsFiles.errors.txt b/tests/baselines/reference/checkJsFiles.errors.txt index 41344dc384a..4f6e59233b2 100644 --- a/tests/baselines/reference/checkJsFiles.errors.txt +++ b/tests/baselines/reference/checkJsFiles.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/a.js(3,1): error TS2322: Type '0' is not assignable to type 'string'. +tests/cases/compiler/a.js(2,1): error TS2322: Type '0' is not assignable to type 'string'. ==== tests/cases/compiler/a.js (1 errors) ==== - var x = "string"; x = 0; ~ diff --git a/tests/baselines/reference/checkJsFiles2.errors.txt b/tests/baselines/reference/checkJsFiles2.errors.txt index 7fc852fba14..2bdca3c8c18 100644 --- a/tests/baselines/reference/checkJsFiles2.errors.txt +++ b/tests/baselines/reference/checkJsFiles2.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type 'string'. +tests/cases/compiler/a.js(3,1): error TS2322: Type '0' is not assignable to type 'string'. ==== tests/cases/compiler/a.js (1 errors) ==== - // @ts-check var x = "string"; x = 0; diff --git a/tests/baselines/reference/checkJsFiles3.errors.txt b/tests/baselines/reference/checkJsFiles3.errors.txt index 7fc852fba14..2bdca3c8c18 100644 --- a/tests/baselines/reference/checkJsFiles3.errors.txt +++ b/tests/baselines/reference/checkJsFiles3.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type 'string'. +tests/cases/compiler/a.js(3,1): error TS2322: Type '0' is not assignable to type 'string'. ==== tests/cases/compiler/a.js (1 errors) ==== - // @ts-check var x = "string"; x = 0; diff --git a/tests/baselines/reference/checkJsFiles4.errors.txt b/tests/baselines/reference/checkJsFiles4.errors.txt index 7fc852fba14..2bdca3c8c18 100644 --- a/tests/baselines/reference/checkJsFiles4.errors.txt +++ b/tests/baselines/reference/checkJsFiles4.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type 'string'. +tests/cases/compiler/a.js(3,1): error TS2322: Type '0' is not assignable to type 'string'. ==== tests/cases/compiler/a.js (1 errors) ==== - // @ts-check var x = "string"; x = 0; diff --git a/tests/baselines/reference/checkJsFiles5.symbols b/tests/baselines/reference/checkJsFiles5.symbols index 76cc21c46a6..696a706601d 100644 --- a/tests/baselines/reference/checkJsFiles5.symbols +++ b/tests/baselines/reference/checkJsFiles5.symbols @@ -1,9 +1,8 @@ === tests/cases/compiler/a.js === - // @ts-nocheck var x = "string"; ->x : Symbol(x, Decl(a.js, 2, 3)) +>x : Symbol(x, Decl(a.js, 1, 3)) x = 0; ->x : Symbol(x, Decl(a.js, 2, 3)) +>x : Symbol(x, Decl(a.js, 1, 3)) diff --git a/tests/baselines/reference/checkJsFiles5.types b/tests/baselines/reference/checkJsFiles5.types index 15704315bbe..f566230948a 100644 --- a/tests/baselines/reference/checkJsFiles5.types +++ b/tests/baselines/reference/checkJsFiles5.types @@ -1,5 +1,4 @@ === tests/cases/compiler/a.js === - // @ts-nocheck var x = "string"; >x : string diff --git a/tests/baselines/reference/checkJsFiles6.errors.txt b/tests/baselines/reference/checkJsFiles6.errors.txt index 89063e50698..fa41e063819 100644 --- a/tests/baselines/reference/checkJsFiles6.errors.txt +++ b/tests/baselines/reference/checkJsFiles6.errors.txt @@ -5,5 +5,4 @@ error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The on !!! error TS5052: Option 'checkJs' cannot be specified without specifying option 'allowJs'. !!! error TS6054: File 'tests/cases/compiler/a.js' has unsupported extension. The only supported extensions are '.ts', '.tsx', '.d.ts'. ==== tests/cases/compiler/a.js (0 errors) ==== - var x; \ No newline at end of file diff --git a/tests/baselines/reference/checkJsFiles_skipDiagnostics.symbols b/tests/baselines/reference/checkJsFiles_skipDiagnostics.symbols index eb2afaf4361..5d9aa8c53c5 100644 --- a/tests/baselines/reference/checkJsFiles_skipDiagnostics.symbols +++ b/tests/baselines/reference/checkJsFiles_skipDiagnostics.symbols @@ -1,20 +1,19 @@ === tests/cases/compiler/a.js === - var x = 0; ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) /// @ts-ignore x(); ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) /// @ts-ignore x(); ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) /// @ts-ignore x( ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) 2, 3); @@ -28,11 +27,11 @@ x( // @anohter x(); ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) // @ts-ignore: no call signature x(); ->x : Symbol(x, Decl(a.js, 1, 3)) +>x : Symbol(x, Decl(a.js, 0, 3)) diff --git a/tests/baselines/reference/checkJsFiles_skipDiagnostics.types b/tests/baselines/reference/checkJsFiles_skipDiagnostics.types index aa24f1f0541..a07bf43901b 100644 --- a/tests/baselines/reference/checkJsFiles_skipDiagnostics.types +++ b/tests/baselines/reference/checkJsFiles_skipDiagnostics.types @@ -1,5 +1,4 @@ === tests/cases/compiler/a.js === - var x = 0; >x : number >0 : 0 diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.errors.txt b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.errors.txt index 951e8bbffd1..045f02e4f36 100644 --- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.errors.txt +++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/es5ExportDefaultClassDeclaration3.ts(2,21): error TS2449: Class 'C' used before its declaration. +tests/cases/compiler/es5ExportDefaultClassDeclaration3.ts(1,21): error TS2449: Class 'C' used before its declaration. ==== tests/cases/compiler/es5ExportDefaultClassDeclaration3.ts (1 errors) ==== - var before: C = new C(); ~ !!! error TS2449: Class 'C' used before its declaration. diff --git a/tests/baselines/reference/exportImport.errors.txt b/tests/baselines/reference/exportImport.errors.txt index fb5a41fe1eb..4f397d54a55 100644 --- a/tests/baselines/reference/exportImport.errors.txt +++ b/tests/baselines/reference/exportImport.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/w1.ts(2,1): error TS2449: Class 'Widget1' used before its declaration. -tests/cases/compiler/w1.ts(2,10): error TS2449: Class 'Widget1' used before its declaration. +tests/cases/compiler/w1.ts(1,1): error TS2449: Class 'Widget1' used before its declaration. +tests/cases/compiler/w1.ts(1,10): error TS2449: Class 'Widget1' used before its declaration. ==== tests/cases/compiler/consumer.ts (0 errors) ==== @@ -9,7 +9,6 @@ tests/cases/compiler/w1.ts(2,10): error TS2449: Class 'Widget1' used before its return new e.w(); } ==== tests/cases/compiler/w1.ts (2 errors) ==== - export = Widget1 ~~~~~~~~~~~~~~~~ !!! error TS2449: Class 'Widget1' used before its declaration. diff --git a/tests/baselines/reference/generatorTypeCheck62.js b/tests/baselines/reference/generatorTypeCheck62.js index 30864722210..e87e2d494be 100644 --- a/tests/baselines/reference/generatorTypeCheck62.js +++ b/tests/baselines/reference/generatorTypeCheck62.js @@ -1,5 +1,4 @@ //// [generatorTypeCheck62.ts] - export interface StrategicState { lastStrategyApplied?: string; } diff --git a/tests/baselines/reference/generatorTypeCheck62.symbols b/tests/baselines/reference/generatorTypeCheck62.symbols index 580ab208840..b8eb11d1f67 100644 --- a/tests/baselines/reference/generatorTypeCheck62.symbols +++ b/tests/baselines/reference/generatorTypeCheck62.symbols @@ -1,106 +1,105 @@ === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts === - export interface StrategicState { >StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0)) lastStrategyApplied?: string; ->lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33)) +>lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 0, 33)) } export function strategy(stratName: string, gen: (a: T) => IterableIterator): (a: T) => IterableIterator { ->strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25)) +>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 2, 1)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 4, 25)) >StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0)) ->stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 5, 51)) ->gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 5, 69)) ->a : Symbol(a, Decl(generatorTypeCheck62.ts, 5, 76)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25)) +>stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 4, 51)) +>gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 4, 69)) +>a : Symbol(a, Decl(generatorTypeCheck62.ts, 4, 76)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 4, 25)) >IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25)) ->a : Symbol(a, Decl(generatorTypeCheck62.ts, 5, 120)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 4, 25)) +>a : Symbol(a, Decl(generatorTypeCheck62.ts, 4, 120)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 4, 25)) >IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 4, 25)) return function*(state) { ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 6, 21)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 5, 21)) for (const next of gen(state)) { ->next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18)) ->gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 5, 69)) ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 6, 21)) +>next : Symbol(next, Decl(generatorTypeCheck62.ts, 6, 18)) +>gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 4, 69)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 5, 21)) if (next) { ->next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18)) +>next : Symbol(next, Decl(generatorTypeCheck62.ts, 6, 18)) next.lastStrategyApplied = stratName; ->next.lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33)) ->next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18)) ->lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33)) ->stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 5, 51)) +>next.lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 0, 33)) +>next : Symbol(next, Decl(generatorTypeCheck62.ts, 6, 18)) +>lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 0, 33)) +>stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 4, 51)) } yield next; ->next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18)) +>next : Symbol(next, Decl(generatorTypeCheck62.ts, 6, 18)) } } } export interface Strategy { ->Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26)) +>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 13, 1)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 15, 26)) (a: T): IterableIterator; ->a : Symbol(a, Decl(generatorTypeCheck62.ts, 17, 5)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26)) +>a : Symbol(a, Decl(generatorTypeCheck62.ts, 16, 5)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 15, 26)) >IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --)) ->T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26)) +>T : Symbol(T, Decl(generatorTypeCheck62.ts, 15, 26)) } export interface State extends StrategicState { ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) >StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0)) foo: number; ->foo : Symbol(State.foo, Decl(generatorTypeCheck62.ts, 20, 47)) +>foo : Symbol(State.foo, Decl(generatorTypeCheck62.ts, 19, 47)) } export const Nothing1: Strategy = strategy("Nothing", function*(state: State) { ->Nothing1 : Symbol(Nothing1, Decl(generatorTypeCheck62.ts, 24, 12)) ->Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) ->strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1)) ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 24, 71)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) +>Nothing1 : Symbol(Nothing1, Decl(generatorTypeCheck62.ts, 23, 12)) +>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 13, 1)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) +>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 2, 1)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 23, 71)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) return state; ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 24, 71)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 23, 71)) }); export const Nothing2: Strategy = strategy("Nothing", function*(state: State) { ->Nothing2 : Symbol(Nothing2, Decl(generatorTypeCheck62.ts, 28, 12)) ->Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) ->strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1)) ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 28, 71)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) +>Nothing2 : Symbol(Nothing2, Decl(generatorTypeCheck62.ts, 27, 12)) +>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 13, 1)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) +>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 2, 1)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 27, 71)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) yield state; ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 28, 71)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 27, 71)) }); export const Nothing3: Strategy = strategy("Nothing", function* (state: State) { ->Nothing3 : Symbol(Nothing3, Decl(generatorTypeCheck62.ts, 32, 12)) ->Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) ->strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1)) ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 32, 72)) ->State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1)) +>Nothing3 : Symbol(Nothing3, Decl(generatorTypeCheck62.ts, 31, 12)) +>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 13, 1)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) +>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 2, 1)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 31, 72)) +>State : Symbol(State, Decl(generatorTypeCheck62.ts, 17, 1)) yield ; return state; ->state : Symbol(state, Decl(generatorTypeCheck62.ts, 32, 72)) +>state : Symbol(state, Decl(generatorTypeCheck62.ts, 31, 72)) }); diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types index 289d33dc7d4..f8b3a9117b1 100644 --- a/tests/baselines/reference/generatorTypeCheck62.types +++ b/tests/baselines/reference/generatorTypeCheck62.types @@ -1,5 +1,4 @@ === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts === - export interface StrategicState { >StrategicState : StrategicState diff --git a/tests/baselines/reference/generatorTypeCheck63.errors.txt b/tests/baselines/reference/generatorTypeCheck63.errors.txt index 46e722a0dd1..ed2ed36a438 100644 --- a/tests/baselines/reference/generatorTypeCheck63.errors.txt +++ b/tests/baselines/reference/generatorTypeCheck63.errors.txt @@ -1,15 +1,14 @@ -tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(25,14): error TS2322: Type '(a: State | 1) => IterableIterator' is not assignable to type 'Strategy'. +tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,14): error TS2322: Type '(a: State | 1) => IterableIterator' is not assignable to type 'Strategy'. Type 'IterableIterator' is not assignable to type 'IterableIterator'. Type 'State | 1' is not assignable to type 'State'. Type '1' is not assignable to type 'State'. -tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(30,70): error TS7025: Generator implicitly has type 'IterableIterator' because it does not yield any values. Consider supplying a return type. -tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(33,42): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly. +tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(29,70): error TS7025: Generator implicitly has type 'IterableIterator' because it does not yield any values. Consider supplying a return type. +tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(32,42): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly. Type argument candidate 'State' is not a valid type argument because it is not a supertype of candidate '1'. -tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(37,14): error TS2322: Type '(a: State | 1) => IterableIterator' is not assignable to type 'Strategy'. +tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,14): error TS2322: Type '(a: State | 1) => IterableIterator' is not assignable to type 'Strategy'. ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts (4 errors) ==== - export interface StrategicState { lastStrategyApplied?: string; } diff --git a/tests/baselines/reference/generatorTypeCheck63.js b/tests/baselines/reference/generatorTypeCheck63.js index 92cf2f867fc..d19d18fb1df 100644 --- a/tests/baselines/reference/generatorTypeCheck63.js +++ b/tests/baselines/reference/generatorTypeCheck63.js @@ -1,5 +1,4 @@ //// [generatorTypeCheck63.ts] - export interface StrategicState { lastStrategyApplied?: string; } diff --git a/tests/baselines/reference/indexedAccessRelation.js b/tests/baselines/reference/indexedAccessRelation.js index c58c214e69e..10384c9eacd 100644 --- a/tests/baselines/reference/indexedAccessRelation.js +++ b/tests/baselines/reference/indexedAccessRelation.js @@ -20,8 +20,8 @@ class Comp extends Component> //// [indexedAccessRelation.js] -// Repro from #14723 "use strict"; +// Repro from #14723 var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || diff --git a/tests/baselines/reference/tsxSfcReturnNull.js b/tests/baselines/reference/tsxSfcReturnNull.js index 8a332a7057f..793342be96a 100644 --- a/tests/baselines/reference/tsxSfcReturnNull.js +++ b/tests/baselines/reference/tsxSfcReturnNull.js @@ -1,5 +1,4 @@ //// [file.tsx] - import React = require('react'); const Foo = (props: any) => null; diff --git a/tests/baselines/reference/tsxSfcReturnNull.symbols b/tests/baselines/reference/tsxSfcReturnNull.symbols index 483b7db6c59..20869bcfdd4 100644 --- a/tests/baselines/reference/tsxSfcReturnNull.symbols +++ b/tests/baselines/reference/tsxSfcReturnNull.symbols @@ -1,25 +1,24 @@ === tests/cases/conformance/jsx/file.tsx === - import React = require('react'); >React : Symbol(React, Decl(file.tsx, 0, 0)) const Foo = (props: any) => null; ->Foo : Symbol(Foo, Decl(file.tsx, 3, 5)) ->props : Symbol(props, Decl(file.tsx, 3, 13)) +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) +>props : Symbol(props, Decl(file.tsx, 2, 13)) function Greet(x: {name?: string}) { ->Greet : Symbol(Greet, Decl(file.tsx, 3, 33)) ->x : Symbol(x, Decl(file.tsx, 5, 15)) ->name : Symbol(name, Decl(file.tsx, 5, 19)) +>Greet : Symbol(Greet, Decl(file.tsx, 2, 33)) +>x : Symbol(x, Decl(file.tsx, 4, 15)) +>name : Symbol(name, Decl(file.tsx, 4, 19)) return null; } const foo = ; ->foo : Symbol(foo, Decl(file.tsx, 9, 5)) ->Foo : Symbol(Foo, Decl(file.tsx, 3, 5)) +>foo : Symbol(foo, Decl(file.tsx, 8, 5)) +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) const G = ; ->G : Symbol(G, Decl(file.tsx, 10, 5)) ->Greet : Symbol(Greet, Decl(file.tsx, 3, 33)) +>G : Symbol(G, Decl(file.tsx, 9, 5)) +>Greet : Symbol(Greet, Decl(file.tsx, 2, 33)) diff --git a/tests/baselines/reference/tsxSfcReturnNull.types b/tests/baselines/reference/tsxSfcReturnNull.types index edc346b03e6..262bce80c75 100644 --- a/tests/baselines/reference/tsxSfcReturnNull.types +++ b/tests/baselines/reference/tsxSfcReturnNull.types @@ -1,5 +1,4 @@ === tests/cases/conformance/jsx/file.tsx === - import React = require('react'); >React : typeof React diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js index 8a332a7057f..793342be96a 100644 --- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js +++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.js @@ -1,5 +1,4 @@ //// [file.tsx] - import React = require('react'); const Foo = (props: any) => null; diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols index 483b7db6c59..20869bcfdd4 100644 --- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols +++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.symbols @@ -1,25 +1,24 @@ === tests/cases/conformance/jsx/file.tsx === - import React = require('react'); >React : Symbol(React, Decl(file.tsx, 0, 0)) const Foo = (props: any) => null; ->Foo : Symbol(Foo, Decl(file.tsx, 3, 5)) ->props : Symbol(props, Decl(file.tsx, 3, 13)) +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) +>props : Symbol(props, Decl(file.tsx, 2, 13)) function Greet(x: {name?: string}) { ->Greet : Symbol(Greet, Decl(file.tsx, 3, 33)) ->x : Symbol(x, Decl(file.tsx, 5, 15)) ->name : Symbol(name, Decl(file.tsx, 5, 19)) +>Greet : Symbol(Greet, Decl(file.tsx, 2, 33)) +>x : Symbol(x, Decl(file.tsx, 4, 15)) +>name : Symbol(name, Decl(file.tsx, 4, 19)) return null; } const foo = ; ->foo : Symbol(foo, Decl(file.tsx, 9, 5)) ->Foo : Symbol(Foo, Decl(file.tsx, 3, 5)) +>foo : Symbol(foo, Decl(file.tsx, 8, 5)) +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) const G = ; ->G : Symbol(G, Decl(file.tsx, 10, 5)) ->Greet : Symbol(Greet, Decl(file.tsx, 3, 33)) +>G : Symbol(G, Decl(file.tsx, 9, 5)) +>Greet : Symbol(Greet, Decl(file.tsx, 2, 33)) diff --git a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types index 5268592b8d7..15b1dee69b1 100644 --- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types +++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types @@ -1,5 +1,4 @@ === tests/cases/conformance/jsx/file.tsx === - import React = require('react'); >React : typeof React diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt index 127eb4b0d44..f3452f62ccb 100644 --- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt +++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.errors.txt @@ -1,9 +1,8 @@ -tests/cases/conformance/jsx/file.tsx(10,13): error TS2605: JSX element type 'undefined' is not a constructor function for JSX elements. -tests/cases/conformance/jsx/file.tsx(11,11): error TS2605: JSX element type 'undefined' is not a constructor function for JSX elements. +tests/cases/conformance/jsx/file.tsx(9,13): error TS2605: JSX element type 'undefined' is not a constructor function for JSX elements. +tests/cases/conformance/jsx/file.tsx(10,11): error TS2605: JSX element type 'undefined' is not a constructor function for JSX elements. ==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== - import React = require('react'); const Foo = (props: any) => undefined; diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js index 0fcaa2f1689..5d3825db91c 100644 --- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js +++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js @@ -1,5 +1,4 @@ //// [file.tsx] - import React = require('react'); const Foo = (props: any) => undefined;