cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(language-service): correctly type undefined

Browse Source 
fixes #13412
closes #13414
This commit is contained in:
Chuck Jazdzewski
2016-12-12 18:11:56 -08:00
committed by Victor Berchet
parent 4544b1d7a6
commit 0a7364feea
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/@angular/language-service/src/expressions.ts
View File

@ -201,22 +201,25 @@ class AstType implements ExpressionVisitor {
visitBinary(ast: Binary): Symbol { visitBinary(ast: Binary): Symbol {
// Treat undefined and null as other. // Treat undefined and null as other.
function normalize(kind: BuiltinType): BuiltinType { function normalize(kind: BuiltinType, other: BuiltinType): BuiltinType {
switch (kind) { switch (kind) {
case BuiltinType.Undefined: case BuiltinType.Undefined:
case BuiltinType.Null: case BuiltinType.Null:
return BuiltinType.Other; return normalize(other, BuiltinType.Other);
} }
return kind; return kind;
} }
const leftType = this.getType(ast.left); const leftType = this.getType(ast.left);
const rightType = this.getType(ast.right); const rightType = this.getType(ast.right);
const leftKind = normalize(this.query.getTypeKind(leftType)); const leftRawKind = this.query.getTypeKind(leftType);
const rightKind = normalize(this.query.getTypeKind(rightType)); const rightRawKind = this.query.getTypeKind(rightType);
const leftKind = normalize(leftRawKind, rightRawKind);
const rightKind = normalize(rightRawKind, leftRawKind);
// The following swtich implements operator typing similar to the // The following swtich implements operator typing similar to the
// type production tables in the TypeScript specification. // type production tables in the TypeScript specification.
// https://github.com/Microsoft/TypeScript/blob/v1.8.10/doc/spec.md#4.19
const operKind = leftKind << 8 | rightKind; const operKind = leftKind << 8 | rightKind;
switch (ast.operation) { switch (ast.operation) {
case '*': case '*':
@ -403,6 +406,8 @@ class AstType implements ExpressionVisitor {
return this.query.getBuiltinType(BuiltinType.Boolean); return this.query.getBuiltinType(BuiltinType.Boolean);
case null: case null:
return this.query.getBuiltinType(BuiltinType.Null); return this.query.getBuiltinType(BuiltinType.Null);
case undefined:
return this.query.getBuiltinType(BuiltinType.Undefined);
default: default:
switch (typeof ast.value) { switch (typeof ast.value) {
case 'string': case 'string':