Check for using 'this' and 'super'. Tests. Issue 662.

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

 // Copyright (c) 2011, 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.Sets;
 import com.google.dart.compiler.DartCompilationPhase;
 import com.google.dart.compiler.DartCompilerContext;
@@ skipping 618 matching lines @@
     @Override
     public Element visitSwitchMember(DartSwitchMember x) {
       getContext().pushScope("<switch member>");
       x.visitChildren(this);
       getContext().popScope();
       return null;
     }
 
     @Override
     public Element visitThisExpression(DartThisExpression x) {
-      if (currentMethod.getModifiers().isStatic()) {
-        onError(x, ResolverErrorCode.STATIC_METHOD_ACCESS_THIS);
-      } else if (ElementKind.of(currentHolder).equals(ElementKind.LIBRARY)) {
-        onError(x, ResolverErrorCode.TOP_LEVEL_METHOD_ACCESS_THIS);
+      if (ElementKind.of(currentHolder).equals(ElementKind.LIBRARY)) {
+        onError(x, ResolverErrorCode.THIS_ON_TOP_LEVEL);
+      } else if (currentMethod == null) {
+        onError(x, ResolverErrorCode.THIS_OUTSIDE_OF_METHOD);
+      } else if (currentMethod.getModifiers().isStatic()) {
+        onError(x, ResolverErrorCode.THIS_IN_STATIC_METHOD);
+      } else if (currentMethod.getModifiers().isFactory()) {
+        onError(x, ResolverErrorCode.THIS_IN_FACTORY_CONSTRUCTOR);
       }
       return null;
     }
 
     @Override
     public Element visitSuperExpression(DartSuperExpression x) {
       if (ElementKind.of(currentHolder).equals(ElementKind.LIBRARY)) {
-        onError(x, ResolverErrorCode.TOP_LEVEL_METHOD_ACCESS_SUPER);
+        onError(x, ResolverErrorCode.SUPER_ON_TOP_LEVEL);
       } else if (currentMethod == null) {
         onError(x, ResolverErrorCode.SUPER_OUTSIDE_OF_METHOD);
       } else if (currentMethod.getModifiers().isStatic()) {
-        onError(x, ResolverErrorCode.STATIC_METHOD_ACCESS_SUPER);
+        onError(x, ResolverErrorCode.SUPER_IN_STATIC_METHOD);
       } else if  (currentMethod.getModifiers().isFactory()) {
-        onError(x, ResolverErrorCode.FACTORY_ACCESS_SUPER);
+        onError(x, ResolverErrorCode.SUPER_IN_FACTORY_CONSTRUCTOR);
       } else {
         return recordElement(x, Elements.superElement(
             x, ((ClassElement) currentHolder).getSupertype().getElement()));
       }
       return null;
     }
 
     @Override
     public Element visitSuperConstructorInvocation(DartSuperConstructorInvocation x) {
       visit(x.getArgs());
@@ skipping 843 matching lines @@
         ClassElement nextClass = (ClassElement) nextConstructorElement.getEnclosingElement();
         ClassElement currentClass = (ClassElement) constructor.getEnclosingElement();
         if (nextClass.getName().equals(currentClass.getName())) {
           return nextConstructorElement;
         }
       }
     }
     return null;
   }
 }