Skip to content

Decorator type metadata #2589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbuckton merged 18 commits into from
Apr 6, 2015
Merged

Decorator type metadata #2589

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2a907a9
Type serialization for decorators
rbuckton Mar 17, 2015
a1d445e
Updated baselines
rbuckton Mar 18, 2015
71803c6
Minor emit cleanup
rbuckton Mar 26, 2015
9aa3af8
Type serialization for decorators
rbuckton Mar 17, 2015
2b78424
Updated baselines
rbuckton Mar 18, 2015
f556d46
Minor emit cleanup
rbuckton Mar 26, 2015
ce5910e
Updated baselines
rbuckton Mar 18, 2015
c5f49de
Minor emit cleanup
rbuckton Mar 26, 2015
8a7fa55
Fix merge conflict
rbuckton Apr 1, 2015
98afb92
Cleanup emit for type metadata for #2577
rbuckton Apr 1, 2015
c804f5b
Fix for checking type nodes with separate compilation, removed duplic…
rbuckton Apr 1, 2015
5c44038
Added __param helper for parameter decorators and cleaned up __decora…
rbuckton Apr 2, 2015
d9078e9
Updated baseline
rbuckton Apr 2, 2015
f15ff32
Fix for #2561
rbuckton Apr 2, 2015
9a590db
PR feedback
rbuckton Apr 2, 2015
98c56ae
PR feedback
rbuckton Apr 6, 2015
1a18133
Merge branch 'master' into decorators_types
rbuckton Apr 6, 2015
1bab233
Updated baselines
rbuckton Apr 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@rbuckton
rbuckton committed Apr 6, 2015
commit 98c56ae9a8aac5bc5024a4ebd8db943418530755
25 changes: 18 additions & 7 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8768,19 +8768,28 @@ module ts {
*/
function checkTypeAnnotationAsExpression(node: AccessorDeclaration | PropertyDeclaration | ParameterDeclaration | MethodDeclaration) {
switch (node.kind) {
case SyntaxKind.PropertyDeclaration: return checkTypeNodeAsExpression((<PropertyDeclaration>node).type);
case SyntaxKind.Parameter: return checkTypeNodeAsExpression((<ParameterDeclaration>node).type);
case SyntaxKind.MethodDeclaration: return checkTypeNodeAsExpression((<MethodDeclaration>node).type);
case SyntaxKind.GetAccessor: return checkTypeNodeAsExpression((<AccessorDeclaration>node).type);
case SyntaxKind.SetAccessor: return checkTypeNodeAsExpression(getSetAccessorTypeAnnotationNode(<AccessorDeclaration>node));
case SyntaxKind.PropertyDeclaration:
checkTypeNodeAsExpression((<PropertyDeclaration>node).type);
break;
case SyntaxKind.Parameter: checkTypeNodeAsExpression((<ParameterDeclaration>node).type);
break;
case SyntaxKind.MethodDeclaration:
checkTypeNodeAsExpression((<MethodDeclaration>node).type);
break;
case SyntaxKind.GetAccessor:
checkTypeNodeAsExpression((<AccessorDeclaration>node).type);
break;
case SyntaxKind.SetAccessor:
checkTypeNodeAsExpression(getSetAccessorTypeAnnotationNode(<AccessorDeclaration>node));
break;
}
}

/** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
function checkParameterTypeAnnotationsAsExpressions(node: FunctionLikeDeclaration) {
// ensure all type annotations with a value declaration are checked as an expression
if (node) {
forEach(node.parameters, checkTypeAnnotationAsExpression);
for (let parameter of node.parameters) {
checkTypeAnnotationAsExpression(parameter);
}
}

Expand Down Expand Up @@ -11624,7 +11633,9 @@ module ts {
case SyntaxKind.TypeLiteral:
case SyntaxKind.UnionType:
case SyntaxKind.AnyKeyword:
break;
default:
Debug.fail("Cannot serialize unexpected type node.");
break;
Copy link
Copy Markdown
Contributor

@CyrusNajmabadi CyrusNajmabadi Apr 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly assert here that somethign was missed. That way if we add a new type kind in the future we know we have to update this.

}
}
Expand Down