remove usage of dead trackers

VISTALL · VISTALL · commit 1f42ea91e746 · 2026-01-03T14:25:33.000+02:00
diff --git a/jam-api/src/main/java/com/intellij/jam/model/common/JamSupportMetaData.java b/jam-api/src/main/java/com/intellij/jam/model/common/JamSupportMetaData.java
@@ -59,7 +59,7 @@ public Object[] getDependences() {
     if (myElement != null) {
       final List<Object> deps = new SmartList<Object>();
       deps.add(getDeclaration());
-      deps.add(PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      deps.add(PsiModificationTracker.MODIFICATION_COUNT);
       for (final DomElement domElement : ModelMergerUtil.getImplementations(myElement, DomElement.class)) {
         if (domElement.isValid()) {
           deps.add(DomUtil.getFileElement(domElement));
@@ -68,7 +68,7 @@ public Object[] getDependences() {
       return deps.toArray();
     }
 
-    return new Object[]{getDeclaration(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT};
+    return new Object[]{getDeclaration(), PsiModificationTracker.MODIFICATION_COUNT};
   }
 
   @NonNls
diff --git a/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java b/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java
@@ -370,7 +370,7 @@ public static Collection<PsiClass> getAnnotationTypesWithChildren(
       cachedValue = CachedValuesManager.getManager(module.getProject()).createCachedValue(
         () -> {
           final Collection<PsiClass> classes = getAnnotationTypesWithChildren(annotationName, module);
-          return new CachedValueProvider.Result<>(classes, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+          return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);
         },
         false
       );
@@ -409,7 +409,7 @@ public static Collection<PsiClass> getAnnotatedTypes(
         } else {
           classes = getChildren(psiClass, scope);
         }
-        return new CachedValueProvider.Result<>(classes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+        return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);
       }, false);
 
       module.putUserData(key, cachedValue);
@@ -558,7 +558,7 @@ public static <T extends JamElement> CachedValue<List<T>> createClassCachedValue
           }
         }
       }
-      return new CachedValueProvider.Result<>(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return new CachedValueProvider.Result<>(result, PsiModificationTracker.MODIFICATION_COUNT);
     }, false);
   }
 
diff --git a/jam-api/src/main/java/com/intellij/jam/reflect/JamChildrenQuery.java b/jam-api/src/main/java/com/intellij/jam/reflect/JamChildrenQuery.java
@@ -69,7 +69,7 @@ public final List<Jam> findChildren(@Nonnull PsiElementRef<? extends PsiMember>
     if (data == null) {
       parent.putUserData(myCacheKey, data = CachedValuesManager.getManager(parent.getProject()).createCachedValue(new CachedValueProvider<List<Jam>>() {
         public Result<List<Jam>> compute() {
-          return Result.create(findChildren(parent), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+          return Result.create(findChildren(parent), PsiModificationTracker.MODIFICATION_COUNT);
         }
       }, false));
     }
diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/junit/JUnitUtil.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/junit/JUnitUtil.java
@@ -233,7 +233,7 @@ public static boolean isTestClass(@Nonnull PsiClass psiClass, boolean checkAbstr
 
     return LanguageCachedValueUtil.getCachedValue(
       psiClass,
-      () -> CachedValueProvider.Result.create(hasTestOrSuiteMethods(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT)
+      () -> CachedValueProvider.Result.create(hasTestOrSuiteMethods(psiClass), PsiModificationTracker.MODIFICATION_COUNT)
     );
   }
 
@@ -342,7 +342,7 @@ public static boolean isJUnit5TestClass(@Nonnull final PsiClass psiClass, boolea
             }
           }
         }
-        return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+        return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.MODIFICATION_COUNT);
       });
     }
 
diff --git a/java-language-api/src/main/java/com/intellij/java/language/codeInsight/TestFrameworks.java b/java-language-api/src/main/java/com/intellij/java/language/codeInsight/TestFrameworks.java
@@ -63,12 +63,12 @@ public boolean isTestOrConfig(PsiClass psiClass) {
 
   @Nullable
   public static TestFramework detectFramework(@Nonnull final PsiClass psiClass) {
-    return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFramework(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT));
+    return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFramework(psiClass), PsiModificationTracker.MODIFICATION_COUNT));
   }
 
   @Nonnull
   public static Set<TestFramework> detectApplicableFrameworks(@Nonnull final PsiClass psiClass) {
-    return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFrameworks(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT));
+    return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFrameworks(psiClass), PsiModificationTracker.MODIFICATION_COUNT));
   }
 
   private static Set<TestFramework> computeFrameworks(PsiClass psiClass) {
diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/LambdaUtil.java
@@ -193,7 +193,7 @@ public static MethodSignature getFunction(final PsiClass psiClass) {
         @Nonnull
         @Override
         public Result<MethodSignature> compute() {
-          return Result.create(calcFunction(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+          return Result.create(calcFunction(psiClass), PsiModificationTracker.MODIFICATION_COUNT);
         }
       });
     }
diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiDisjunctionType.java b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiDisjunctionType.java
@@ -52,7 +52,7 @@ public PsiDisjunctionType(@Nonnull List<PsiType> types, @Nonnull PsiManager psiM
           break;
         }
       }
-      return CachedValueProvider.Result.create(lub, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.create(lub, PsiModificationTracker.MODIFICATION_COUNT);
     }, false);
   }
 
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/MetaAnnotationUtil.java
@@ -80,7 +80,7 @@ public static Collection<PsiClass> getAnnotationTypesWithChildren(@Nonnull Modul
         GlobalSearchScope effectiveSearchScope = getAllAnnotationFilesScope(project).intersectWith(moduleScope);
         return getAnnotationTypesWithChildren(annotationClass, effectiveSearchScope);
       });
-      return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.MODIFICATION_COUNT);
     });
 
     return map.get(pair(annotationName, includeTests));
@@ -121,7 +121,7 @@ public static Collection<PsiClass> getAnnotatedTypes(@Nonnull Module module, @No
       } else {
         classes = getChildren(psiClass, scope);
       }
-      return new CachedValueProvider.Result<>(classes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);
     }, false);
   }
 
@@ -146,7 +146,7 @@ private static GlobalSearchScope getAllAnnotationFilesScope(Project project) {
       }
 
       scope = GlobalSearchScope.filesWithLibrariesScope(project, allAnnotationFiles);
-      return CachedValueProvider.Result.createSingleDependency(scope, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.createSingleDependency(scope, PsiModificationTracker.MODIFICATION_COUNT);
     });
   }
 
@@ -209,7 +209,7 @@ private static PsiAnnotation metaAnnotationCached(PsiClass subjectAnnotation, St
     return LanguageCachedValueUtil.getCachedValue(subjectAnnotation, () ->
     {
       ConcurrentMap<String, PsiAnnotation> metaAnnotationsMap = ConcurrentFactoryMap.createMap(anno -> findMetaAnnotation(subjectAnnotation, anno, new HashSet<>()));
-      return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.MODIFICATION_COUNT);
     }).get(annotationToFind);
   }
 
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java
@@ -409,7 +409,7 @@ private static class ByNameCachedValueProvider implements ParameterizedCachedVal
         @Override
         public CachedValueProvider.Result<Map<GlobalSearchScope, MembersMap>> compute(@Nonnull final PsiClass myClass) {
             final Map<GlobalSearchScope, MembersMap> map = ConcurrentFactoryMap.createMap(scope -> new MembersMap(myClass, scope));
-            return CachedValueProvider.Result.create(map, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+            return CachedValueProvider.Result.create(map, PsiModificationTracker.MODIFICATION_COUNT);
         }
     }
 
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiSuperMethodImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiSuperMethodImplUtil.java
@@ -459,9 +459,9 @@ public static HierarchicalMethodSignature getHierarchicalMethodSignature(@Nonnul
             }
 
             if (!method.isPhysical() && !(method instanceof SyntheticElement) && !(method instanceof LightElement)) {
-                return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT, method);
+                return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT, method);
             }
-            return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+            return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT);
         };
 
     @Nonnull
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/ScopedClassHierarchy.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/ScopedClassHierarchy.java
@@ -108,7 +108,7 @@ static ScopedClassHierarchy getHierarchy(@Nonnull final PsiClass psiClass, @Nonn
             @Override
             public Result<Map<GlobalSearchScope, ScopedClassHierarchy>> compute() {
                 Map<GlobalSearchScope, ScopedClassHierarchy> result = ConcurrentFactoryMap.createMap(it -> new ScopedClassHierarchy(psiClass, it));
-                return Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+                return Result.create(result, PsiModificationTracker.MODIFICATION_COUNT);
             }
         }).get(resolveScope);
     }
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/file/PsiPackageImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/file/PsiPackageImpl.java
@@ -333,7 +333,7 @@ public void navigate(boolean requestFocus) {
     }
 
     private class PackageAnnotationValueProvider implements CachedValueProvider<PsiModifierList> {
-        private final Object[] OOCB_DEPENDENCY = {PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT};
+        private final Object[] OOCB_DEPENDENCY = {PsiModificationTracker.MODIFICATION_COUNT};
 
         @Override
         @RequiredReadAction
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiClassImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiClassImpl.java
@@ -121,7 +121,7 @@ public PsiElement getOriginalElement() {
       public Result<PsiClass> compute() {
         final JavaPsiImplementationHelper helper = JavaPsiImplementationHelper.getInstance(getProject());
         final PsiClass result = helper != null ? helper.getOriginalClass(PsiClassImpl.this) : PsiClassImpl.this;
-        return Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+        return Result.create(result, PsiModificationTracker.MODIFICATION_COUNT);
       }
     });
   }
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiJavaFileBaseImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiJavaFileBaseImpl.java
@@ -544,7 +544,7 @@ public Result<MostlySingularMultiMap<String, SymbolCollectingProcessor.ResultWit
       SymbolCollectingProcessor p = new SymbolCollectingProcessor();
       myFile.processDeclarationsNoGuess(p, ResolveState.initial(), myFile, myFile);
       MostlySingularMultiMap<String, SymbolCollectingProcessor.ResultWithContext> results = p.getResults();
-      return Result.create(results, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return Result.create(results, PsiModificationTracker.MODIFICATION_COUNT);
     }
   }
 
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiMethodImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiMethodImpl.java
@@ -371,7 +371,7 @@ public MethodSignature getSignature(@Nonnull PsiSubstitutor substitutor) {
                 this,
                 () -> {
                     MethodSignature signature = MethodSignatureBackedByPsiMethod.create(this, PsiSubstitutor.EMPTY);
-                    return CachedValueProvider.Result.create(signature, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+                    return CachedValueProvider.Result.create(signature, PsiModificationTracker.MODIFICATION_COUNT);
                 }
             );
         }
diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -149,7 +149,7 @@ else if (element instanceof PsiClass) {
   public PsiMember getPotentiallyApplicableMember() {
     return LanguageCachedValueUtil.getCachedValue(this,
                                                   () -> CachedValueProvider.Result.create(getPotentiallyApplicableMemberInternal(),
-                                                                                          PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT,
+                                                                                          PsiModificationTracker.MODIFICATION_COUNT,
                                                                                           this));
   }
 
diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/MetaAnnotationUtil.java
@@ -78,7 +78,7 @@ public static Collection<PsiClass> getAnnotationTypesWithChildren(@Nonnull Modul
         GlobalSearchScope effectiveSearchScope = getAllAnnotationFilesScope(project).intersectWith(moduleScope);
         return getAnnotationTypesWithChildren(annotationClass, effectiveSearchScope);
       });
-      return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.MODIFICATION_COUNT);
     });
 
     return map.get(Pair.create(annotationName, includeTests));
@@ -119,7 +119,7 @@ public static Collection<PsiClass> getAnnotatedTypes(Module module, Key<CachedVa
       } else {
         classes = getChildren(psiClass, scope);
       }
-      return new CachedValueProvider.Result<>(classes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+      return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);
     }, false);
   }
 
@@ -144,7 +144,7 @@ private static GlobalSearchScope getAllAnnotationFilesScope(Project project) {
           return true;
         });
       }
-      return CachedValueProvider.Result.createSingleDependency(GlobalSearchScope.filesWithLibrariesScope(project, allAnnotationFiles), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return CachedValueProvider.Result.createSingleDependency(GlobalSearchScope.filesWithLibrariesScope(project, allAnnotationFiles), PsiModificationTracker.MODIFICATION_COUNT);
     });
   }
 
@@ -183,7 +183,7 @@ private static PsiAnnotation metaAnnotationCached(PsiClass subjectAnnotation, St
     ConcurrentMap<String, PsiAnnotation> cachedValue = LanguageCachedValueUtil.getCachedValue(subjectAnnotation, () ->
     {
       ConcurrentMap<String, PsiAnnotation> metaAnnotationsMap = ConcurrentFactoryMap.createMap(anno -> findMetaAnnotation(subjectAnnotation, anno, new HashSet<>()));
-      return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
+      return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.MODIFICATION_COUNT);
     });
     return cachedValue.get(annotationToFind);
   }
diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/file/PsiPackageImplementationHelperImpl.java
@@ -105,7 +105,7 @@ public boolean packagePrefixExists(PsiJavaPackage psiPackage) {
   @Override
   public Object[] getDirectoryCachedValueDependencies(PsiJavaPackage psiPackage) {
     return new Object[]{
-      PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT,
+      PsiModificationTracker.MODIFICATION_COUNT,
       ProjectRootManager.getInstance(psiPackage.getProject())
     };
   }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ public static Collection<PsiClass> getAnnotationTypesWithChildren(`
`370`	`370`	`cachedValue = CachedValuesManager.getManager(module.getProject()).createCachedValue(`
`371`	`371`	`() -> {`
`372`	`372`	`final Collection<PsiClass> classes = getAnnotationTypesWithChildren(annotationName, module);`
`373`		`- return new CachedValueProvider.Result<>(classes, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`373`	`+ return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);`
`374`	`374`	`},`
`375`	`375`	`false`
`376`	`376`	`);`
`@@ -409,7 +409,7 @@ public static Collection<PsiClass> getAnnotatedTypes(`
`409`	`409`	`} else {`
`410`	`410`	`classes = getChildren(psiClass, scope);`
`411`	`411`	`}`
`412`		`- return new CachedValueProvider.Result<>(classes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);`
	`412`	`+ return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);`
`413`	`413`	`}, false);`
`414`	`414`
`415`	`415`	`module.putUserData(key, cachedValue);`
`@@ -558,7 +558,7 @@ public static <T extends JamElement> CachedValue<List<T>> createClassCachedValue`
`558`	`558`	`}`
`559`	`559`	`}`
`560`	`560`	`}`
`561`		`- return new CachedValueProvider.Result<>(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`561`	`+ return new CachedValueProvider.Result<>(result, PsiModificationTracker.MODIFICATION_COUNT);`
`562`	`562`	`}, false);`
`563`	`563`	`}`
`564`	`564`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public final List<Jam> findChildren(@Nonnull PsiElementRef<? extends PsiMember>`
`69`	`69`	`if (data == null) {`
`70`	`70`	`parent.putUserData(myCacheKey, data = CachedValuesManager.getManager(parent.getProject()).createCachedValue(new CachedValueProvider<List<Jam>>() {`
`71`	`71`	`public Result<List<Jam>> compute() {`
`72`		`- return Result.create(findChildren(parent), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`72`	`+ return Result.create(findChildren(parent), PsiModificationTracker.MODIFICATION_COUNT);`
`73`	`73`	`}`
`74`	`74`	`}, false));`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public static boolean isTestClass(@Nonnull PsiClass psiClass, boolean checkAbstr`
`233`	`233`
`234`	`234`	`return LanguageCachedValueUtil.getCachedValue(`
`235`	`235`	`psiClass,`
`236`		`- () -> CachedValueProvider.Result.create(hasTestOrSuiteMethods(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT)`
	`236`	`+ () -> CachedValueProvider.Result.create(hasTestOrSuiteMethods(psiClass), PsiModificationTracker.MODIFICATION_COUNT)`
`237`	`237`	`);`
`238`	`238`	`}`
`239`	`239`
`@@ -342,7 +342,7 @@ public static boolean isJUnit5TestClass(@Nonnull final PsiClass psiClass, boolea`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`	`}`
`345`		`- return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`345`	`+ return CachedValueProvider.Result.create(hasAnnotation, PsiModificationTracker.MODIFICATION_COUNT);`
`346`	`346`	`});`
`347`	`347`	`}`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,12 @@ public boolean isTestOrConfig(PsiClass psiClass) {`
`63`	`63`
`64`	`64`	`@Nullable`
`65`	`65`	`public static TestFramework detectFramework(@Nonnull final PsiClass psiClass) {`
`66`		`- return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFramework(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT));`
	`66`	`+ return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFramework(psiClass), PsiModificationTracker.MODIFICATION_COUNT));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Nonnull`
`70`	`70`	`public static Set<TestFramework> detectApplicableFrameworks(@Nonnull final PsiClass psiClass) {`
`71`		`- return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFrameworks(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT));`
	`71`	`+ return LanguageCachedValueUtil.getCachedValue(psiClass, () -> CachedValueProvider.Result.create(computeFrameworks(psiClass), PsiModificationTracker.MODIFICATION_COUNT));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private static Set<TestFramework> computeFrameworks(PsiClass psiClass) {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public static MethodSignature getFunction(final PsiClass psiClass) {`
`193`	`193`	`@Nonnull`
`194`	`194`	`@Override`
`195`	`195`	`public Result<MethodSignature> compute() {`
`196`		`- return Result.create(calcFunction(psiClass), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`196`	`+ return Result.create(calcFunction(psiClass), PsiModificationTracker.MODIFICATION_COUNT);`
`197`	`197`	`}`
`198`	`198`	`});`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public PsiDisjunctionType(@Nonnull List<PsiType> types, @Nonnull PsiManager psiM`
`52`	`52`	`break;`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`- return CachedValueProvider.Result.create(lub, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);`
	`55`	`+ return CachedValueProvider.Result.create(lub, PsiModificationTracker.MODIFICATION_COUNT);`
`56`	`56`	`}, false);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static Collection<PsiClass> getAnnotationTypesWithChildren(@Nonnull Modul`
`80`	`80`	`GlobalSearchScope effectiveSearchScope = getAllAnnotationFilesScope(project).intersectWith(moduleScope);`
`81`	`81`	`return getAnnotationTypesWithChildren(annotationClass, effectiveSearchScope);`
`82`	`82`	`});`
`83`		`- return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`83`	`+ return CachedValueProvider.Result.create(factoryMap, PsiModificationTracker.MODIFICATION_COUNT);`
`84`	`84`	`});`
`85`	`85`
`86`	`86`	`return map.get(pair(annotationName, includeTests));`
`@@ -121,7 +121,7 @@ public static Collection<PsiClass> getAnnotatedTypes(@Nonnull Module module, @No`
`121`	`121`	`} else {`
`122`	`122`	`classes = getChildren(psiClass, scope);`
`123`	`123`	`}`
`124`		`- return new CachedValueProvider.Result<>(classes, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);`
	`124`	`+ return new CachedValueProvider.Result<>(classes, PsiModificationTracker.MODIFICATION_COUNT);`
`125`	`125`	`}, false);`
`126`	`126`	`}`
`127`	`127`
`@@ -146,7 +146,7 @@ private static GlobalSearchScope getAllAnnotationFilesScope(Project project) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`scope = GlobalSearchScope.filesWithLibrariesScope(project, allAnnotationFiles);`
`149`		`- return CachedValueProvider.Result.createSingleDependency(scope, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`149`	`+ return CachedValueProvider.Result.createSingleDependency(scope, PsiModificationTracker.MODIFICATION_COUNT);`
`150`	`150`	`});`
`151`	`151`	`}`
`152`	`152`
`@@ -209,7 +209,7 @@ private static PsiAnnotation metaAnnotationCached(PsiClass subjectAnnotation, St`
`209`	`209`	`return LanguageCachedValueUtil.getCachedValue(subjectAnnotation, () ->`
`210`	`210`	`{`
`211`	`211`	`ConcurrentMap<String, PsiAnnotation> metaAnnotationsMap = ConcurrentFactoryMap.createMap(anno -> findMetaAnnotation(subjectAnnotation, anno, new HashSet<>()));`
`212`		`- return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`212`	`+ return new CachedValueProvider.Result<>(metaAnnotationsMap, PsiModificationTracker.MODIFICATION_COUNT);`
`213`	`213`	`}).get(annotationToFind);`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ private static class ByNameCachedValueProvider implements ParameterizedCachedVal`
`409`	`409`	`@Override`
`410`	`410`	`public CachedValueProvider.Result<Map<GlobalSearchScope, MembersMap>> compute(@Nonnull final PsiClass myClass) {`
`411`	`411`	`final Map<GlobalSearchScope, MembersMap> map = ConcurrentFactoryMap.createMap(scope -> new MembersMap(myClass, scope));`
`412`		`- return CachedValueProvider.Result.create(map, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);`
	`412`	`+ return CachedValueProvider.Result.create(map, PsiModificationTracker.MODIFICATION_COUNT);`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
Original file line number	Diff line number	Diff line change
`@@ -459,9 +459,9 @@ public static HierarchicalMethodSignature getHierarchicalMethodSignature(@Nonnul`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`if (!method.isPhysical() && !(method instanceof SyntheticElement) && !(method instanceof LightElement)) {`
`462`		`- return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT, method);`
	`462`	`+ return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT, method);`
`463`	`463`	`}`
`464`		`- return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);`
	`464`	`+ return CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT);`
`465`	`465`	`};`
`466`	`466`
`467`	`467`	`@Nonnull`