From 0a1907de11ef8c6bfcbc3e3afa5f337489f537c9 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 3 Dec 2012 19:04:59 +0400
Subject: [PATCH] Check all modifiers for objects

DeclarationsChecker didn't check visibility modifiers for objects
---
 .../org/jetbrains/jet/lang/resolve/DeclarationsChecker.java  | 2 +-
 compiler/testData/diagnostics/tests/IllegalModifiers.kt      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
index 518345d6c70..777c3afefb7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
@@ -64,7 +64,7 @@ public class DeclarationsChecker {
 
             if (!bodiesResolveContext.completeAnalysisNeeded(objectDeclaration)) continue;
             checkObject(objectDeclaration);
-            modifiersChecker.checkIllegalModalityModifiers(objectDeclaration);
+            modifiersChecker.checkModifiersForDeclaration(objectDeclaration, objectDescriptor);
         }
 
         Map<JetNamedFunction, SimpleFunctionDescriptor> functions = bodiesResolveContext.getFunctions();
diff --git a/compiler/testData/diagnostics/tests/IllegalModifiers.kt b/compiler/testData/diagnostics/tests/IllegalModifiers.kt
index af975b94c9d..5b0a46aea28 100644
--- a/compiler/testData/diagnostics/tests/IllegalModifiers.kt
+++ b/compiler/testData/diagnostics/tests/IllegalModifiers.kt
@@ -18,4 +18,7 @@ class FinalClass() {
         <!ILLEGAL_MODIFIER!>open<!> get(): Int = $i
     var j: Int = 1
         <!ILLEGAL_MODIFIER!>open<!> set(v: Int) {}
-}
\ No newline at end of file
+}
+
+<!INCOMPATIBLE_MODIFIERS!>private<!> <!INCOMPATIBLE_MODIFIERS!>public<!> class C
+<!INCOMPATIBLE_MODIFIERS!>private<!> <!INCOMPATIBLE_MODIFIERS!>public<!> object D