Support for DartBlockBody, DartExpressionBody, DartOmit in java2dart.

pkg/analyzer/lib/src/generated/parser.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.parser;
 
 import 'java_core.dart';
@@ skipping 8542 matching lines @@
       return false;
     }
     return first.lexeme == second.lexeme;
   }
 }
 
 /**
  * Instances of the class {link ToFormattedSourceVisitor} write a source representation of a visited
  * AST node (and all of it's children) to a writer.
  */
 class ToFormattedSourceVisitor implements AstVisitor<Object> {

[Brian Wilkerson, 2014/03/07 16:12:31]

I don't understand why this class is here. It is part of the java2dart
translator, not part of the engine.

[scheglov, 2014/03/07 22:47:44]

You are right.
I used it once about a year ago, but we don't need it in production.
Removed.

   static String COMMENTS_KEY = "List of comments before statement";
 
+  static String BLOCK_BODY_KEY = "Block body source";
+
+  static String EXPRESSION_BODY_KEY = "Expression body source";
+
   /**
    * The writer to which the source is to be written.
    */
   PrintWriter _writer;
 
   int _indentLevel = 0;
 
   String _indentString = "";
 
   /**
@@ skipping 578 matching lines @@
     visitNode(node.documentationComment);
     visitTokenWithSuffix(node.externalKeyword, " ");
     visitTokenWithSuffix(node.modifierKeyword, " ");
     visitNodeWithSuffix(node.returnType, " ");
     visitTokenWithSuffix(node.propertyKeyword, " ");
     visitTokenWithSuffix(node.operatorKeyword, " ");
     visitNode(node.name);
     if (!node.isGetter) {
       visitNode(node.parameters);
     }
-    if (node.body is! EmptyFunctionBody) {
-      _writer.print(' ');
+    String bodySource;
+    if ((bodySource = node.getProperty(BLOCK_BODY_KEY) as String) != null) {
+      _writer.print(" {");
+      if (!bodySource.isEmpty) {
+        nl();
+        _writer.print(bodySource);
+      }
+      nl2();
+      _writer.print('}');
+    } else if ((bodySource = node.getProperty(EXPRESSION_BODY_KEY) as String) != null) {
+      _writer.print(" => ");
+      _writer.print(bodySource);
+      _writer.print(';');
+    } else {
+      if (node.body is! EmptyFunctionBody) {
+        _writer.print(' ');
+      }
+      visitNode(node.body);
     }
-    visitNode(node.body);
     return null;
   }
 
   Object visitMethodInvocation(MethodInvocation node) {
     if (node.isCascaded) {
       _writer.print("..");
     } else {
       visitNodeWithSuffix(node.target, ".");
     }
     visitNode(node.methodName);
@@ skipping 449 matching lines @@
    * @param suffix the suffix to be printed if there is a node to visit
    * @param node the node to be visited
    */
   void visitTokenWithSuffix(Token token, String suffix) {
     if (token != null) {
       _writer.print(token.lexeme);
       _writer.print(suffix);
     }
   }
 }