New analyzer_experimental snapshot.

editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 83 matching lines @@
 public class Context {
   /**
    * Information about constructor and its usages.
    */
   public static class ConstructorDescription {
     final IMethodBinding binding;
     public final List<RedirectingConstructorInvocation> redirectingInvocations = Lists.newArrayList();
     public final List<SuperConstructorInvocation> superInvocations = Lists.newArrayList();
     public final List<InstanceCreationExpression> instanceCreations = Lists.newArrayList();
     public boolean isEnum;
+    public boolean insertEnclosingTypeRef;
     String declName;
 
     public ConstructorDescription(IMethodBinding binding) {
       this.binding = binding;
     }
   }
 
   private static final String[] JAVA_EXTENSION = {"java"};
   private final List<File> classpathFiles = Lists.newArrayList();
   private final List<File> sourceFolders = Lists.newArrayList();
@@ skipping 432 matching lines @@
    * @return the artificial {@link ClassDeclaration}created for Java creation of anonymous class
    *         declaration.
    */
   public ClassDeclaration getAnonymousDeclaration(InstanceCreationExpression creation) {
     return anonymousDeclarations.get(creation);
   }
 
   /**
    * @return the not <code>null</code> {@link ConstructorDescription}, may be just added.
    */
+  public ConstructorDescription getConstructorDescription(ConstructorDeclaration node) {
+    IMethodBinding binding = constructorToBinding.get(node);
+    return getConstructorDescription(binding);
+  }
+
+  /**
+   * @return the not <code>null</code> {@link ConstructorDescription}, may be just added.
+   */
   public ConstructorDescription getConstructorDescription(IMethodBinding binding) {
     ConstructorDescription description = bindingToConstructor.get(binding);
     if (description == null) {
       description = new ConstructorDescription(binding);
       bindingToConstructor.put(binding, description);
     }
     return description;
   }
 
   public Map<File, List<CompilationUnitMember>> getFileToMembers() {
@@ skipping 117 matching lines @@
     {
       replaceInnerClassReferences(dartUniverse);
       unwrapVarArgIfAlreadyArray(dartUniverse);
       ensureFieldInitializers(dartUniverse);
       dontUseThisInFieldInitializers(dartUniverse);
       ensureUniqueClassMemberNames(dartUniverse);
       ensureNoVariableNameReferenceFromInitializer(dartUniverse);
       ensureMethodParameterDoesNotHide(dartUniverse);
       new ConstructorSemanticProcessor(this).process(dartUniverse);
       renameConstructors(dartUniverse);
+      insertEnclosingTypeForInstanceCreationArguments(dartUniverse);
     }
     // done
     return dartUniverse;
   }
 
   /**
    * @return the "technical" name for the top-level Dart class for Java anonymous class.
    */
   int generateTechnicalAnonymousClassIndex() {
     return technicalAnonymousClassIndex++;
@@ skipping 308 matching lines @@
         }
         memberNamesInClass.add(name);
         // apply name
         renameConstructor(node, name);
         // continue
         return super.visitConstructorDeclaration(node);
       }
     });
   }
 
+  // XXX

[Brian Wilkerson, 2013/08/07 20:31:29]

Remove?

+  private void insertEnclosingTypeForInstanceCreationArguments(CompilationUnit unit) {
+    unit.accept(new RecursiveASTVisitor<Void>() {
+      @Override
+      public Void visitInstanceCreationExpression(InstanceCreationExpression node) {
+        IMethodBinding binding = (IMethodBinding) getNodeBinding(node);
+        ConstructorDescription constructorDescription = getConstructorDescription(binding);
+        if (constructorDescription.insertEnclosingTypeRef) {
+          node.getArgumentList().getArguments().add(0, thisExpression());
+        }
+        return super.visitInstanceCreationExpression(node);
+      }
+    });
+  }
+
   private void replaceInnerClassReferences(CompilationUnit unit) {
     for (SimpleIdentifier identifier : innerClassNames) {
       renameIdentifier(identifier, identifier.getName());
     }
   }
 
   /**
    * Translate {@link #sourceFiles} into Dart AST in {@link #dartUnits}.
    */
   private void translateSyntax() throws Exception {
@@ skipping 58 matching lines @@
                   }
                 }
               }
             }
           }
         }
       }
     });
   }
 }