Update baselines from merging with master

This commit is contained in:
Kanchalai Tanglertsampan 2017-03-29 08:52:00 -07:00
parent 42f398076d
commit af731e0700
27 changed files with 91 additions and 117 deletions

View File

@ -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() {

View File

@ -1,5 +1,4 @@
//// [ES5For-ofTypeCheck10.ts]
// In ES3/5, you cannot for...of over an arbitrary iterable.
class StringIterator {
next() {

View File

@ -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;
~

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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))

View File

@ -1,5 +1,4 @@
=== tests/cases/compiler/a.js ===
// @ts-nocheck
var x = "string";
>x : string

View File

@ -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;

View File

@ -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))

View File

@ -1,5 +1,4 @@
=== tests/cases/compiler/a.js ===
var x = 0;
>x : number
>0 : 0

View File

@ -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.

View File

@ -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.

View File

@ -1,5 +1,4 @@
//// [generatorTypeCheck62.ts]
export interface StrategicState {
lastStrategyApplied?: string;
}

View File

@ -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<T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>): (a: T) => IterableIterator<T | undefined> {
>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<T> {
>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<T | undefined>;
>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<State> = 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<State> = 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<State> = 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))
});

View File

@ -1,5 +1,4 @@
=== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts ===
export interface StrategicState {
>StrategicState : StrategicState

View File

@ -1,15 +1,14 @@
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(25,14): error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,14): error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
Type 'IterableIterator<State | 1>' is not assignable to type 'IterableIterator<State>'.
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<any>' 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<any>' 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<State | 1>' is not assignable to type 'Strategy<State>'.
tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(36,14): error TS2322: Type '(a: State | 1) => IterableIterator<State | 1>' is not assignable to type 'Strategy<State>'.
==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts (4 errors) ====
export interface StrategicState {
lastStrategyApplied?: string;
}

View File

@ -1,5 +1,4 @@
//// [generatorTypeCheck63.ts]
export interface StrategicState {
lastStrategyApplied?: string;
}

View File

@ -20,8 +20,8 @@ class Comp<T extends Foo, S> extends Component<S & State<T>>
//// [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; }) ||

View File

@ -1,5 +1,4 @@
//// [file.tsx]
import React = require('react');
const Foo = (props: any) => null;

View File

@ -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 />;
>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 = <Greet />;
>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))

View File

@ -1,5 +1,4 @@
=== tests/cases/conformance/jsx/file.tsx ===
import React = require('react');
>React : typeof React

View File

@ -1,5 +1,4 @@
//// [file.tsx]
import React = require('react');
const Foo = (props: any) => null;

View File

@ -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 />;
>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 = <Greet />;
>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))

View File

@ -1,5 +1,4 @@
=== tests/cases/conformance/jsx/file.tsx ===
import React = require('react');
>React : typeof React

View File

@ -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;

View File

@ -1,5 +1,4 @@
//// [file.tsx]
import React = require('react');
const Foo = (props: any) => undefined;