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

fix(compiler): allow expressions or functions in extends (#14158)

Browse Source 
Fixes #14154

PR Close #14158
This commit is contained in:
Alex Eagle
2017-01-27 15:35:31 -08:00
committed by Miško Hevery
parent 8270bec343
commit b4214d60a6
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/@angular/compiler/src/aot/static_reflector.ts
View File

@ -86,7 +86,7 @@ export class StaticReflector implements ReflectorReader {
annotations = [];
const classMetadata = this.getTypeMetadata(type);
if (classMetadata['extends']) {
const parentType = this.simplify(type, classMetadata['extends']);
const parentType = this.trySimplify(type, classMetadata['extends']);
if (parentType && (parentType instanceof StaticSymbol)) {
const parentAnnotations = this.annotations(parentType);
annotations.push(...parentAnnotations);
@ -303,6 +303,17 @@ export class StaticReflector implements ReflectorReader {
}
}
/**
* Simplify but discard any errors
*/
private trySimplify(context: StaticSymbol, value: any): any {
const originalRecorder = this.errorRecorder;
this.errorRecorder = (error: any, fileName: string) => {};
const result = this.simplify(context, value);
this.errorRecorder = originalRecorder;
return result;
}
/** @internal */
public simplify(context: StaticSymbol, value: any): any {
const self = this;