From ab4179189b2b89b37520035d27f883abd3816a06 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 21 Apr 2014 17:58:50 +0200 Subject: [PATCH] fix(StaticMetadataExtractor): Map members annotations to all annotations Closes #904 --- lib/tools/transformer/metadata_extractor.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/tools/transformer/metadata_extractor.dart b/lib/tools/transformer/metadata_extractor.dart index f1858be86..443d54ae5 100644 --- a/lib/tools/transformer/metadata_extractor.dart +++ b/lib/tools/transformer/metadata_extractor.dart @@ -284,8 +284,11 @@ class AnnotationExtractor { annotation.parent.element); return false; } - return element.enclosingElement.type.isAssignableTo(directiveType.type) || - element.enclosingElement.type.isAssignableTo(formatterType.type); + + enclosingType = element.enclosingElement.type; + + return enclosingType.isAssignableTo(directiveType.type) || + enclosingType.isAssignableTo(formatterType.type); }).toList(); if (type.annotations.isEmpty) return null; @@ -359,7 +362,7 @@ class AnnotationExtractor { var map = new MapLiteral(null, null, null, [], null); var label = new Label(new SimpleIdentifier( new _GeneratedToken(TokenType.STRING, 'map')), - new _GeneratedToken(TokenType.COLON, ':')); + new _GeneratedToken(TokenType.COLON, ':')); mapArg = new NamedExpression(label, map); annotation.arguments.arguments.add(mapArg); }