Issue 3985. Tweaks for warning messages

compiler/java/com/google/dart/compiler/resolver/Elements.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.base.Objects;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ skipping 365 matching lines @@
       if (element instanceof ClassElement) {
         return false;
       }
       element = element.getEnclosingElement();
     }
     return true;
   }
 
   public static boolean isNonFactoryConstructor(Element method) {
     return !method.getModifiers().isFactory()
-        && ElementKind.of(method).equals(ElementKind.CONSTRUCTOR);
+        && ElementKind.of(method) == ElementKind.CONSTRUCTOR;
   }
 
   public static boolean isTopLevel(Element element) {
-    return ElementKind.of(element.getEnclosingElement()).equals(ElementKind.LIBRARY);
+    return ElementKind.of(element.getEnclosingElement()) == ElementKind.LIBRARY;
   }
 
   static List<TypeVariable> makeTypeVariables(List<DartTypeParameter> parameterNodes,
                                               EnclosingElement enclosingElement) {
     if (parameterNodes == null) {
       return Arrays.<TypeVariable>asList();
     }
     TypeVariable[] typeVariables = new TypeVariable[parameterNodes.size()];
     int i = 0;
     for (DartTypeParameter parameterNode : parameterNodes) {
@@ skipping 79 matching lines @@
     List<String> names = Lists.newArrayList();
     List<VariableElement> parameters = method.getParameters();
     for (VariableElement parameter : parameters) {
       String typeName = parameter.getType().getElement().getName();
       names.add(typeName);
     }
     return names;
   }
 
   /**
+   * @return the user readable title of the given {@link Element}, a little different than
+   *         "technical" title returned from {@link Element#toString()}.
+   */
+  public static String getUserElementTitle(Element element) {
+    return MessageFormat.format("{0} ''{1}''", getUserElementKindTitle(element), element.getName());
+  }
+
+  /**
+   * @return the user readable title of the given {@link Element}'s {@link ElementKind}, a little
+   *         different than "technical" title returned from {@link Element#toString()}.
+   */
+  private static String getUserElementKindTitle(Element element) {
+    ElementKind kind = element.getKind();
+    switch (kind) {
+      case CLASS:
+        if (((ClassElement) element).isInterface()) {
+          return "interface";
+        }
+        break;
+      case METHOD:
+        if (isTopLevel(element)) {
+          return "top-level function";
+        }
+        break;
+      case FIELD:
+        if (isTopLevel(element)) {
+          return "top-level variable";
+        }
+        break;
+    }
+    String title = kind.toString();

[devoncarew, 2012/07/08 10:09:16]

We could also add a method on ElementKind that would encapsulate the knowledge
that toString().replace("_", " ").toLowerCase() resulted in a user-facing label.

[scheglov, 2012/07/08 14:01:08]

Well, no we could not.
Because as you can see, user-visible title depends on element parent, not just
on element kind.

+    title = StringUtils.replace(title, "_", " ");
+    title = title.toLowerCase();
+    return title;
+  }
+
+  /**
    * @return the {@link String} which contains user-readable description of "target" {@link Element}
    *         location relative to "source".
    */
   public static String getRelativeElementLocation(Element source, Element target) {
     // Prepare "target" SourceInfo.
     SourceInfo targetInfo;
     {
       targetInfo = target.getNameLocation();
       if (targetInfo == null) {
         return "unknown";
       }
     }
     // Prepare path to the target unit from source unit.
     String targetPath;
     {
       SourceInfo sourceInfo = source.getSourceInfo();
       targetPath = getRelativeSourcePath(sourceInfo, targetInfo);
     }
     // Prepare (may be empty) target class name.
     String targetClassName;
     {
-      ClassElement targetClass = getEnclosingClassElement(target);
+      EnclosingElement targetEnclosing = target.getEnclosingElement();
+      ClassElement targetClass = getEnclosingClassElement(targetEnclosing);
       targetClassName = targetClass != null ? targetClass.getName() : "";
     }
     // Format location string.
-    return MessageFormat.format(
-        "{0}:{1}:{2}:{3}",
-        targetPath,
-        targetClassName,
-        targetInfo.getLine(),
-        targetInfo.getColumn());
+    if (StringUtils.isEmpty(targetClassName)) {
+      return MessageFormat.format("{0} line:{1} col:{2}", targetPath, targetInfo.getLine(),

[devoncarew, 2012/07/08 10:09:16]

This location information seems overly precise to me. Consider changing:

"Foo.dart line:3 col:11"

to:

"Foo.dart line 3"

your call -

[scheglov, 2012/07/08 14:01:08]

This is same information and same format of location as VM prints.
Sometimes you may appreciate column information.

+          targetInfo.getColumn());
+    } else {
+      return MessageFormat.format("{0} class:{1} line:{2} col:{3}", targetPath, targetClassName,
+          targetInfo.getLine(), targetInfo.getColumn());
+    }
   }
 
   /**
    * @return the relative or absolute path from "source" to "target".
    */
   private static String getRelativeSourcePath(SourceInfo source, SourceInfo target) {
     Source sourceSource = source.getSource();
     Source targetSource = target.getSource();
     return getRelativeSourcePath(sourceSource, targetSource);
   }
@@ skipping 171 matching lines @@
     if (element instanceof MethodElement) {
       MethodElement methodElement = (MethodElement) element;
       return Objects.equal(methodElement.getName(), "assert")
           && methodElement.getEnclosingElement() instanceof LibraryElement
           && methodElement.getEnclosingElement().getName().equals("dart://core/core_runtime.dart");
     }
     return false;
   }
 
 }