More aggressive block cache invalidation for declarations with type inference

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifiableBlockHelper.java

@@ -35,18 +35,18 @@ public final class JetModifiableBlockHelper {
             if (declaration instanceof JetNamedFunction) {
                 JetNamedFunction function = (JetNamedFunction) declaration;
                 if (function.hasDeclaredReturnType() || function.hasBlockBody()) {
-                    return false;
+                    return takePartInDeclarationTypeInference(function);
                 }
 
                 return shouldChangeModificationCount(function);
             }
             else if (declaration instanceof JetPropertyAccessor) {
-                return false;
+                return takePartInDeclarationTypeInference(declaration);
             }
             else if (declaration instanceof JetProperty) {
                 JetProperty property = (JetProperty) declaration;
                 if (property.getPropertyTypeRef() != null) {
-                    return false;
+                    return takePartInDeclarationTypeInference(property);
                 }
 
                 return shouldChangeModificationCount(property);
@@ -59,4 +59,26 @@ public final class JetModifiableBlockHelper {
 
         return true;
     }
+
+    private static boolean takePartInDeclarationTypeInference(PsiElement place) {
+        JetDeclaration declaration = PsiTreeUtil.getParentOfType(place, JetDeclaration.class, true);
+        if (declaration != null) {
+            if (declaration instanceof JetNamedFunction) {
+                JetNamedFunction function = (JetNamedFunction) declaration;
+                if (!function.hasDeclaredReturnType()) {
+                    return true;
+                }
+            }
+            else if (declaration instanceof JetProperty) {
+                JetProperty property = (JetProperty) declaration;
+                if (property.getPropertyTypeRef() == null) {
+                    return true;
+                }
+            }
+
+            return takePartInDeclarationTypeInference(declaration);
+        }
+
+        return false;
+    }
 }

idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt

@@ -0,0 +1,6 @@
+// TRUE
+val o = object {
+  fun test() {
+    <caret>
+  }
+}

idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTest.java

@@ -54,6 +54,10 @@ public class OutOfBlockModificationTest extends LightCodeInsightFixtureTestCase
         doTest();
     }
 
+    public void testInAntonymsObjectDeclaration() {
+        doTest();
+    }
+
     public void testInPropertyWithFunctionLiteral() {
         doTest();
     }