fix(StaticMetadataExtractor): Map members annotations to all annotations

Closes dart-archive#904
vicb · Apr 21, 2014 · ab41791 · ab41791
1 parent 90f7582
commit ab41791
Showing 1 changed file with 6 additions and 3 deletions.
diff --git 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);
       }