Issue 13703. Report CONFLICTING_TYPE_VARIABLE_AND_CLASS and CONFLICTING_TYPE_VARIABLE_AND_MEMBER.

editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java
diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java
index 2c99c6a6acbca36b186df3f0014f8484c2249b67..6004207f6f2b44902baa96507cce8051f11d72eb 100644
--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java
+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/error/CompileTimeErrorCode.java
@@ -116,6 +116,20 @@ public enum CompileTimeErrorCode implements ErrorCode {
       "'%s' cannot be used to name a constructor and a method in this class"),
 
   /**
+   * 7. Classes: It is a compile time error if a generic class declares a type variable with the
+   * same name as the class or any of its members or constructors.
+   */
+  CONFLICTING_TYPE_VARIABLE_AND_CLASS(
+      "'%s' cannot be used to name a type varaible in a class with the same name"),
+
+  /**
+   * 7. Classes: It is a compile time error if a generic class declares a type variable with the
+   * same name as the class or any of its members or constructors.
+   */
+  CONFLICTING_TYPE_VARIABLE_AND_MEMBER(
+      "'%s' cannot be used to name a type varaible and member in this class"),
+
+  /**
    * 12.11.2 Const: It is a compile-time error if evaluation of a constant object results in an
    * uncaught exception being thrown.
    */