New analyzer 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 26 matching lines @@
 import com.google.dart.engine.ast.MethodInvocation;
 import com.google.dart.engine.ast.NodeList;
 import com.google.dart.engine.ast.RedirectingConstructorInvocation;
 import com.google.dart.engine.ast.SimpleIdentifier;
 import com.google.dart.engine.ast.SuperConstructorInvocation;
 import com.google.dart.engine.ast.ThisExpression;
 import com.google.dart.engine.ast.VariableDeclaration;
 import com.google.dart.engine.ast.VariableDeclarationList;
 import com.google.dart.engine.ast.visitor.GeneralizingASTVisitor;
 import com.google.dart.engine.ast.visitor.RecursiveASTVisitor;
+import com.google.dart.engine.ast.visitor.UnifyingASTVisitor;
 import com.google.dart.engine.scanner.Keyword;
 import com.google.dart.engine.scanner.KeywordToken;
 import com.google.dart.engine.scanner.TokenType;
 import com.google.dart.java2dart.processor.ConstructorSemanticProcessor;
 import com.google.dart.java2dart.processor.LocalVariablesSemanticProcessor;
 import com.google.dart.java2dart.util.Bindings;
 import com.google.dart.java2dart.util.JavaUtils;
 
 import static com.google.dart.java2dart.util.ASTFactory.assignmentExpression;
 import static com.google.dart.java2dart.util.ASTFactory.block;
@@ skipping 150 matching lines @@
   /**
    * @return {@code true} if the method with the given signature (which could be made getter or
    *         setter) is allowed to be converted into getter/setter.
    */
   public boolean canMakeProperty(SimpleIdentifier identifier) {
     IBinding binding = getNodeBinding(identifier);
     String signature = JavaUtils.getJdtSignature(binding);
     return !notPropertySet.contains(signature);
   }
 
+  /**
+   * Clears information about the given {@link ASTNode} and its children.
+   */
+  public void clearNodes(ASTNode node) {
+    if (node != null) {
+      node.accept(new UnifyingASTVisitor<Void>() {
+        @Override
+        public Void visitNode(ASTNode node) {
+          clearNode(node);
+          return super.visitNode(node);
+        }
+      });
+    }
+  }
+
   public void ensureUniqueClassMemberNames(CompilationUnit unit) {
     unit.accept(new RecursiveASTVisitor<Void>() {
       private final Set<ClassMember> untouchableMethods = Sets.newHashSet();
       private final Map<String, ClassMember> usedClassMembers = Maps.newHashMap();
       private final Set<String> superNames = Sets.newHashSet();
       private final Map<String, List<IMethodBinding>> superMembers = Maps.newHashMap();
 
       @Override
       public Void visitClassDeclaration(ClassDeclaration node) {
         untouchableMethods.clear();
@@ skipping 258 matching lines @@
       if (identifiers == null) {
         identifiers = Lists.newLinkedList();
         bindingToIdentifiers.put(binding, identifiers);
       }
       identifiers.add(identifier);
     }
     // remember global name
     usedNames.add(identifier.getName());
   }
 
+  /**
+   * Removes recorded identifier reference.
+   */
+  public void removeReference(SimpleIdentifier identifier) {
+    IBinding binding = getNodeBinding(identifier);
+    List<SimpleIdentifier> identifiers = bindingToIdentifiers.get(binding);
+    if (identifiers != null) {
+      identifiers.remove(identifier);
+    }
+  }
+
   public void renameConstructor(ConstructorDeclaration node, String name) {
     IMethodBinding binding = constructorToBinding.get(node);
     //
     SimpleIdentifier newIdentifier;
     if (name == null) {
       newIdentifier = null;
     } else {
       newIdentifier = identifier(name);
     }
     // rename constructor
@@ skipping 132 matching lines @@
     nodeToTypeBinding.put(node, binding);
   }
 
   /**
    * Remembers that given {@link ClassMember} was created for private Java element.
    */
   void putPrivateClassMember(ClassMember member) {
     privateClassMembers.add(member);
   }
 
+  /**
+   * Clears information about the given {@link ASTNode}.
+   */
+  private void clearNode(ASTNode node) {
+    if (node instanceof SimpleIdentifier) {
+      removeReference((SimpleIdentifier) node);
+    }
+    nodeToBinding.remove(node);
+    nodeToTypeBinding.remove(node);
+  }
+
   private void dontUseThisInFieldInitializers(CompilationUnit unit) {
     unit.accept(new RecursiveASTVisitor<Void>() {
       @Override
       public Void visitClassDeclaration(ClassDeclaration node) {
         processClass(node);
         return super.visitClassDeclaration(node);
       }
 
       private void addAssignmentsToBlock(Block block, Map<SimpleIdentifier, Expression> initializers) {
         int index = 0;
@@ skipping 286 matching lines @@
                   }
                 }
               }
             }
           }
         }
       }
     });
   }
 }