Remove Element.getNode() method

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java
index bd9e8456b482473526aa627b06605a2171865567..bcc5af03117ca339c92c6bb2a1a3bc8a8c6982b7 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java
@@ -52,6 +52,7 @@ import com.google.dart.compiler.ast.DartWhileStatement;
 import com.google.dart.compiler.parser.DartScannerParserContext;
 import com.google.dart.compiler.parser.ParserContext;
 import com.google.dart.compiler.resolver.ClassElement;
+import com.google.dart.compiler.resolver.ClassNodeElement;
 import com.google.dart.compiler.resolver.ConstructorElement;
 import com.google.dart.compiler.resolver.CoreTypeProvider;
 import com.google.dart.compiler.resolver.CoreTypeProviderImplementation;
@@ -59,6 +60,7 @@ import com.google.dart.compiler.resolver.Element;
 import com.google.dart.compiler.resolver.ElementKind;
 import com.google.dart.compiler.resolver.FieldElement;
 import com.google.dart.compiler.resolver.MethodElement;
+import com.google.dart.compiler.resolver.NodeElement;
 import com.google.dart.compiler.resolver.ResolutionContext;
 import com.google.dart.compiler.resolver.Resolver;
 import com.google.dart.compiler.resolver.Scope;
@@ -1030,7 +1032,7 @@ public class CompletionEngine {
   private ErrorRecordingContext context = new ErrorRecordingContext();
   private DartClassMember<? extends DartExpression> resolvedMember;
   private CoreTypeProvider typeProvider;
-  private ClassElement classElement;
+  private ClassNodeElement classElement;
   private boolean isCompletionAfterDot;
   private DartUnit parsedUnit;
   private CompilationUnit currentCompilationUnit;
@@ -1174,8 +1176,8 @@ public class CompletionEngine {
     classElement = null;
     if (resolvedMember != null) {
       Element encElement = resolvedMember.getElement().getEnclosingElement();
-      if (encElement instanceof ClassElement) {
-        classElement = (ClassElement) encElement;
+      if (encElement instanceof ClassNodeElement) {
+        classElement = (ClassNodeElement) encElement;
       }
     } else {
       DartClass resolvedClass = finder.getEnclosingClass();
@@ -1190,7 +1192,7 @@ public class CompletionEngine {
     if (classElement != null) {
       resolutionContext = resolutionContext.extend(classElement);
     }
-    Element member = resolvedMember == null ? classElement : resolvedMember.getElement();
+    NodeElement member = resolvedMember == null ? classElement : resolvedMember.getElement();
     try {
       resolver.resolveMember(classElement, member, resolutionContext);
     } catch (AssertionError ex) {
@@ -1379,18 +1381,7 @@ public class CompletionEngine {
       proposal.setIsSetter(isSetter);
       proposal.setParameterNames(getParameterNames(method));
       proposal.setParameterTypeNames(getParameterTypeNames(method));
-      String returnTypeName;
-      if (method.getReturnType().getKind() == TypeKind.DYNAMIC) {
-        // TODO Remove this code when the element says it has void return type
-        DartMethodDefinition methodNode = (DartMethodDefinition) method.getNode();
-        try {
-          returnTypeName = methodNode.getFunction().getReturnTypeNode().toString();
-        } catch (NullPointerException ex) {
-          returnTypeName = method.getReturnType().getElement().getName();
-        }
-      } else {
-        returnTypeName = method.getReturnType().getElement().getName();
-      }
+      String returnTypeName = method.getReturnType().getElement().getName();

[Brian Wilkerson, 2012/03/16 15:04:51]

Do methods always have a return type? How does the compiler handle a return type
of "var"? (My concern here is whether this can result in a NPE.)

[scheglov, 2012/03/16 18:25:02]

Yes, if return type is not specified, it is Dynamic.
I've added ypeAnalyzerCompilerTest.test_methodReturnTypes() to show this.

       proposal.setTypeName(returnTypeName.toCharArray());
       proposal.setDeclarationTypeName(method.getEnclosingElement().getName().toCharArray());
       setSourceLoc(proposal, node, prefix);