Modification count fixed
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Nov 2014 20:12:29 +0000 (23:12 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Nov 2014 20:12:29 +0000 (23:12 +0300)
python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java
python/src/com/jetbrains/python/magicLiteral/PyMagicLiteralTools.java
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java

index 4ed8d6740281b872c4d463a264e021653f470dff..ea1c15a5e837badb53aba9ff58502baec7ec75cb 100644 (file)
@@ -39,7 +39,7 @@ public final class NameResolverTools {
    * Cache: pair [qualified element name, class name (may be null)] by any psi element.
    */
   private static final PsiCacheKey<Pair<String, String>, PyElement> QUALIFIED_AND_CLASS_NAME =
-    PsiCacheKey.create(NameResolverTools.class.getName(), new QualifiedAndClassNameObtainer(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+    PsiCacheKey.create(NameResolverTools.class.getName(), new QualifiedAndClassNameObtainer(), PsiModificationTracker.MODIFICATION_COUNT);
 
   private NameResolverTools() {
 
index c1732d7bb35bc6a25258519a481130d12321c15a..7fbf9b067072852eb9a2c962a76f7ffb01c76b24 100644 (file)
@@ -36,7 +36,7 @@ public final class PyMagicLiteralTools {
    */
   private final static PsiCacheKey<Ref<PyMagicLiteralExtensionPoint>, StringLiteralExpression> MAGIC_LITERAL_POINT =
     PsiCacheKey
-      .create(PyMagicLiteralTools.class.getName(), new MagicLiteralChecker(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      .create(PyMagicLiteralTools.class.getName(), new MagicLiteralChecker(), PsiModificationTracker.MODIFICATION_COUNT);
 
   private PyMagicLiteralTools() {
   }
index cdf30a31a24daece1dac3bde7cd8311c431ba4de..1b432994924ce9cfbf57310de2165554e46bc7eb 100644 (file)
@@ -81,7 +81,7 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
     @Override
     public CachedValueProvider.Result<List<PyClassLikeType>> compute(@NotNull TypeEvalContext context) {
       final List<PyClassLikeType> ancestorTypes = isNewStyleClass() ? getMROAncestorTypes(context) : getOldStyleAncestorTypes(context);
-      return CachedValueProvider.Result.create(ancestorTypes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.create(ancestorTypes, PsiModificationTracker.MODIFICATION_COUNT);
     }
   }
 
@@ -96,7 +96,7 @@ public class PyClassImpl extends PyBaseElementImpl<PyClassStub> implements PyCla
   private class NewStyleCachedValueProvider implements CachedValueProvider<Boolean> {
     @Override
     public Result<Boolean> compute() {
-      return new Result<Boolean>(calculateNewStyleClass(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      return new Result<Boolean>(calculateNewStyleClass(), PsiModificationTracker.MODIFICATION_COUNT);
     }
   }