Issue 21618. Fix for empty code for 'dynamic' type.

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

Index: pkg/analysis_server/lib/src/services/correction/fix_internal.dart
diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
index d5580c04692ee43b96c0fff1e70e7c788d33b7b1..6d97848346b364e1019a01de037834608f9068b4 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -627,11 +627,7 @@ class FixProcessor {
       // append type
       Expression fieldTypeNode = climbPropertyAccess(nameNode);
       DartType fieldType = _inferUndefinedExpressionType(fieldTypeNode);
-      if (fieldType != null) {
-        _appendType(sb, fieldType, 'TYPE');
-      } else {
-        sb.append('var ');
-      }
+      _appendType(sb, fieldType, groupId: 'TYPE', orVar: true);

[Brian Wilkerson, 2014/11/19 15:58:19]

The group id's ought to be named constants.

       // append name
       {
         sb.startPosition('NAME');
@@ -741,11 +737,7 @@ class FixProcessor {
     {
       // append type
       DartType fieldType = _inferUndefinedExpressionType(node);
-      if (fieldType != null) {
-        _appendType(sb, fieldType, 'TYPE');
-      } else {
-        sb.append('var ');
-      }
+      _appendType(sb, fieldType, groupId: 'TYPE', orVar: true);
       // append name
       {
         sb.startPosition('NAME');
@@ -1274,7 +1266,7 @@ class FixProcessor {
       // append return type
       {
         DartType type = _inferUndefinedExpressionType(invocation);
-        _appendType(sb, type, 'RETURN_TYPE');
+        _appendType(sb, type, groupId: 'RETURN_TYPE');
       }
       // append name
       {
@@ -1374,10 +1366,10 @@ class FixProcessor {
           sb.append("static ");
         }
         // append return type
-        _appendType(
-            sb,
-            _inferUndefinedExpressionType(invocation),
-            'RETURN_TYPE');
+        {
+          DartType type = _inferUndefinedExpressionType(invocation);
+          _appendType(sb, type, groupId: 'RETURN_TYPE');
+        }
         // append name
         {
           sb.startPosition("NAME");
@@ -1585,7 +1577,7 @@ class FixProcessor {
         sb.append("static ");
       }
       // append return type
-      _appendType(sb, functionType.returnType, 'RETURN_TYPE');
+      _appendType(sb, functionType.returnType, groupId: 'RETURN_TYPE');
       // append name
       {
         sb.startPosition("NAME");
@@ -1765,7 +1757,8 @@ class FixProcessor {
     sb.append(parameterSource);
   }
 
-  void _appendType(SourceBuilder sb, DartType type, [String groupId]) {
+  void _appendType(SourceBuilder sb, DartType type, {String groupId, bool orVar:
+      false}) {
     if (type != null && !type.isDynamic) {
       Set<LibraryElement> librariesToImport = new Set<LibraryElement>();
       // TODO(scheglov) use librariesToImport
@@ -1778,6 +1771,8 @@ class FixProcessor {
         sb.append(typeSource);
       }
       sb.append(' ');
+    } else if (orVar) {
+      sb.append('var ');
     }
   }
 
@@ -2100,6 +2095,14 @@ class FixProcessor {
   }
 
   /**
+   * Checks if [type] is not `null` and not `dynamic`, so it is worth adding
+   * into the source.
+   */
+  static bool _isInterestingType(DartType type) {
+    return type != null && !type.isDynamic;
+  }
+
+  /**
    * Returns `true` if [node] is a type name.
    */
   static bool _mayBeTypeIdentifier(AstNode node) {