Fix a bug that caused private names from an imported library to be included in the name scope of th…

compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

 // Copyright (c) 2012, 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.
 
 package com.google.dart.compiler.resolver;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilerContext;
@@ skipping 58 matching lines @@
         // Put the prefix in the scope.
         LibraryPrefixElement libraryPrefixElement = libraryPrefixElements.get(prefix);
         if (libraryPrefixElement == null) {
           libraryPrefixElement = new LibraryPrefixElementImplementation(prefix, scope);
           libraryPrefixElements.put(prefix, libraryPrefixElement);
           scope.declareElement(prefix, libraryPrefixElement);
         }
         libraryPrefixElement.addLibrary(lib.getElement());
         // Fill library prefix scope.
         for (DartUnit unit : lib.getUnits()) {
-          fillInUnitScope(unit, listener, libraryPrefixElement.getScope());
+          fillInUnitScope(unit, listener, libraryPrefixElement.getScope(), false);
         }
       } else {
         // Put the elements of the library in the scope.
         for (DartUnit unit : lib.getUnits()) {
-          fillInUnitScope(unit, listener, scope);
+          fillInUnitScope(unit, listener, scope, false);
         }
       }
     }
 
     for (DartUnit unit : library.getUnits()) {
-      fillInUnitScope(unit, listener, scope);
+      fillInUnitScope(unit, listener, scope, true);
     }
   }
 
   @VisibleForTesting
-  void fillInUnitScope(DartUnit unit, DartCompilerListener listener, Scope scope) {
+  void fillInUnitScope(DartUnit unit, DartCompilerListener listener, Scope scope, boolean includePrivate) {
     for (DartNode node : unit.getTopLevelNodes()) {
       if (node instanceof DartFieldDefinition) {
         for (DartField field : ((DartFieldDefinition) node).getFields()) {
-          declare(field.getElement(), listener, scope);
+          Element element = field.getElement();
+          if (includePrivate || !element.getName().startsWith("_")) {

[scheglov, 2012/04/24 18:32:11]

May be use com.google.dart.compiler.ast.DartIdentifier.isPrivateName(String)
But may be this is simple enough to keep as is.

[Brian Wilkerson, 2012/04/24 18:47:24]

Done

+          declare(element, listener, scope);

[scheglov, 2012/04/24 18:32:11]

indentation

[Brian Wilkerson, 2012/04/24 18:47:24]

Done

+          }
         }
       } else {
-        declare((Element) node.getElement(), listener, scope);
+        Element element = node.getElement();
+        if (includePrivate || !element.getName().startsWith("_")) {
+          declare(element, listener, scope);
+        }
       }
     }
   }
 
   private void compilationError(DartCompilerListener listener, SourceInfo node, ErrorCode errorCode,
                         Object... args) {
     DartCompilationError error = new DartCompilationError(node, errorCode, args);
     listener.onError(error);
   }
 
@@ skipping 72 matching lines @@
       Modifiers modifiers = node.getModifiers();
       if (modifiers.isFinal()) {
         // final toplevel fields are implicitly compile-time constants.
         modifiers = modifiers.makeConstant();
       }
       node.setElement(Elements.fieldFromNode(node, library, modifiers));
       return null;
     }
   }
 }