Fixed highlighting for enum and object names in code

#KT-8134 Fixed

compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java

@@ -30,7 +30,15 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     }
 
     public R visitClass(@NotNull JetClass klass, D data) {
-        return visitNamedDeclaration(klass, data);
+        return visitClassOrObject(klass, data);
+    }
+
+    public R visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, D data) {
+        return visitClassOrObject(declaration, data);
+    }
+
+    public R visitClassOrObject(@NotNull JetClassOrObject classOrObject, D data) {
+        return visitNamedDeclaration(classOrObject, data);
     }
 
     public R visitSecondaryConstructor(@NotNull JetSecondaryConstructor constructor, D data) {
@@ -402,10 +410,6 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitJetElement(condition, data);
     }
 
-    public R visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, D data) {
-        return visitNamedDeclaration(declaration, data);
-    }
-
     public R visitObjectDeclarationName(@NotNull JetObjectDeclarationName declarationName, D data) {
         return visitExpression(declarationName, data);
     }

compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java

@@ -33,6 +33,10 @@ public class JetVisitorVoid extends JetVisitor<Void, Void> {
         super.visitClass(klass, null);
     }
 
+    public void visitClassOrObject(@NotNull JetClassOrObject classOrObject) {
+        super.visitClassOrObject(classOrObject, null);
+    }
+
     public void visitSecondaryConstructor(@NotNull JetSecondaryConstructor constructor) {
         super.visitSecondaryConstructor(constructor, null);
     }
@@ -448,6 +452,12 @@ public class JetVisitorVoid extends JetVisitor<Void, Void> {
         return null;
     }
 
+    @Override
+    public final Void visitClassOrObject(@NotNull JetClassOrObject classOrObject, Void data) {
+        visitClassOrObject(classOrObject);
+        return null;
+    }
+
     @Override
     public final Void visitSecondaryConstructor(@NotNull JetSecondaryConstructor constructor, Void data) {
         visitSecondaryConstructor(constructor);

compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt

@@ -154,7 +154,7 @@ public class LazyTopDownAnalyzer {
                     fileScope.forceResolveImport(importDirective)
                 }
 
-                private fun visitClassOrObject(classOrObject: JetClassOrObject) {
+                override fun visitClassOrObject(classOrObject: JetClassOrObject) {
                     val descriptor = lazyDeclarationResolver!!.getClassDescriptor(classOrObject) as ClassDescriptorWithResolutionScopes
 
                     c.getDeclaredClasses().put(classOrObject, descriptor)