Rename ReferenceKind.constField and referenceKind.staticMethod.

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/name_filter.dart';
 
 /**
  * Create a [LinkedLibraryBuilder] corresponding to the given
  * [definingUnit], which should be the defining compilation unit for a library.
@@ skipping 243 matching lines @@
    * the library being prelinked) and store them in [privateNamespace].
    * Excludes names introduced by `import` statements.
    */
   void extractPrivateNames(UnlinkedUnit unit, int unitNum) {
     for (UnlinkedClass cls in unit.classes) {
       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.constField, 0, 0);
+                new _Meaning(unitNum, ReferenceKind.propertyAccessor, 0, 0);
           }
         });
         cls.executables.forEach((executable) {
           ReferenceKind kind = null;
           if (executable.kind == UnlinkedExecutableKind.constructor &&
               executable.isConst) {
             kind = ReferenceKind.constructor;
           } else if (executable.kind ==
                   UnlinkedExecutableKind.functionOrMethod &&
               executable.isStatic) {
-            kind = ReferenceKind.staticMethod;
+            kind = ReferenceKind.method;
           }
           if (kind != null) {
             namespace[executable.name] = new _Meaning(
                 unitNum, kind, 0, executable.typeParameters.length);
           }
         });
         return new _ClassMeaning(
             unitNum, 0, cls.typeParameters.length, namespace);
       });
     }
@@ skipping 124 matching lines @@
         namespace = privateNamespace;
       } else {
         // Prefix references must always point backward.
         assert(reference.prefixReference < i);
         namespace = prefixNamespaces[reference.prefixReference];
         // If in `a.length` the `a` prefix is a top-level variable or a field,
         // then it must be the `String.length` property reference.
         if (namespace == null && reference.name == 'length') {
           ReferenceKind prefixKind = references[reference.prefixReference].kind;
           if (prefixKind == ReferenceKind.topLevelPropertyAccessor ||
-              prefixKind == ReferenceKind.constField) {
+              prefixKind == ReferenceKind.propertyAccessor) {
             references
                 .add(new LinkedReferenceBuilder(kind: ReferenceKind.length));
             continue;
           }
         }
         // Prefix references must always point to proper prefixes.
         assert(namespace != null);
       }
       _Meaning meaning = namespace[reference.name];
       if (meaning != null) {
@@ skipping 68 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();
     }
   }
 }