Rework UnlinkedPublicName.constMembers.

pkg/analyzer/lib/src/summary/prelink.dart

 // Copyright (c) 2016, 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.
 
 import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/name_filter.dart';
 
 /**
  * Create a [LinkedLibraryBuilder] corresponding to the given
@@ skipping 176 matching lines @@
     for (int unitNum = 0; unitNum < unitUris.length; unitNum++) {
       String unitUri = unitUris[unitNum];
       UnlinkedPublicNamespace importedNamespace = getImportCached(unitUri);
       if (importedNamespace == null) {
         continue;
       }
       for (UnlinkedPublicName name in importedNamespace.names) {
         aggregated.putIfAbsent(name.name, () {
           if (name.kind == ReferenceKind.classOrEnum) {
             Map<String, _Meaning> namespace = <String, _Meaning>{};
-            name.constMembers.forEach((executable) {
-              namespace[executable.name] = new _Meaning(unitNum,
-                  executable.kind, 0, executable.numTypeParameters);
+            name.members.forEach((executable) {
+              namespace[executable.name] = new _Meaning(
+                  unitNum, executable.kind, 0, executable.numTypeParameters);
             });
             return new _ClassMeaning(
                 unitNum, dependency, name.numTypeParameters, namespace);
           }
           return new _Meaning(
               unitNum, name.kind, dependency, name.numTypeParameters);
         });
       }
     }
 
@@ skipping 50 matching lines @@
       privateNamespace.putIfAbsent(cls.name, () {
         Map<String, _Meaning> namespace = <String, _Meaning>{};
         cls.fields.forEach((field) {
           if (field.isStatic && field.isConst) {
             namespace[field.name] =
                 new _Meaning(unitNum, ReferenceKind.propertyAccessor, 0, 0);
           }
         });
         cls.executables.forEach((executable) {
           ReferenceKind kind = null;
-          if (executable.kind == UnlinkedExecutableKind.constructor &&
-              executable.isConst) {
+          if (executable.kind == UnlinkedExecutableKind.constructor) {
             kind = ReferenceKind.constructor;
           } else if (executable.kind ==
                   UnlinkedExecutableKind.functionOrMethod &&
               executable.isStatic) {
             kind = ReferenceKind.method;
           }
-          if (kind != null) {
+          if (kind != null && executable.name.isNotEmpty) {
             namespace[executable.name] = new _Meaning(
                 unitNum, kind, 0, executable.typeParameters.length);
           }
         });
         return new _ClassMeaning(
             unitNum, 0, cls.typeParameters.length, namespace);
       });
     }
     for (UnlinkedEnum enm in unit.enums) {
       privateNamespace.putIfAbsent(enm.name,
@@ skipping 211 matching lines @@
    * [sourceUri] is also relative.
    */
   String resolveUri(String sourceUri, String relativeUri) {
     if (sourceUri == null) {
       return relativeUri;
     } else {
       return Uri.parse(sourceUri).resolve(relativeUri).toString();
     }
   }
 }