Merge pull request #1817 from Haehnchen/feature/caches-file

use cache index keys where possible

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java

@@ -10,7 +10,10 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.util.*;
+import com.intellij.psi.util.CachedValue;
+import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.jetbrains.php.PhpIndex;
@@ -135,7 +138,7 @@ public static Collection<VirtualFile> findMetadataForRepositoryClass(final @NotN
                     }
                 }
 
-                return CachedValueProvider.Result.create(repositoryMap, PsiModificationTracker.MODIFICATION_COUNT);
+                return CachedValueProvider.Result.create(repositoryMap, FileIndexCaches.getModificationTrackerForIndexId(project, DoctrineMetadataFileStubIndex.KEY));
             },
             false
         );

src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java

@@ -89,7 +89,7 @@ static public synchronized Set<String> getIndexKeysCache(@NotNull final Project
     }
 
     @NotNull
-    private static ModificationTracker getModificationTrackerForIndexId(@NotNull Project project, @NotNull final ID<?, ?> id) {
+    public static ModificationTracker getModificationTrackerForIndexId(@NotNull Project project, @NotNull final ID<?, ?> id) {
         return () -> FileBasedIndex.getInstance().getIndexModificationStamp(id, project);
     }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -42,6 +42,7 @@
 import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension;
 import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtensionParameter;
 import fr.adrienbrault.idea.symfony2plugin.stubs.SymfonyProcessors;
+import fr.adrienbrault.idea.symfony2plugin.stubs.cache.FileIndexCaches;
 import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TemplateUsage;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.*;
 import fr.adrienbrault.idea.symfony2plugin.templating.TemplateLookupElement;
@@ -2832,7 +2833,7 @@ public static List<String> getIncludeTemplateUsageAsOrderedList(@NotNull Project
                 .limit(100)
                 .collect(Collectors.toList());
 
-            return CachedValueProvider.Result.create(collect, TimeSecondModificationTracker.TIMED_MODIFICATION_TRACKER_60);
+            return CachedValueProvider.Result.create(collect, FileIndexCaches.getModificationTrackerForIndexId(project, TwigIncludeStubIndex.KEY));
         }, false);
     }
 
@@ -2861,7 +2862,7 @@ public static List<String> getEmbedTemplateUsageAsOrderedList(@NotNull Project p
                 .limit(100)
                 .collect(Collectors.toList());
 
-            return CachedValueProvider.Result.create(collect, TimeSecondModificationTracker.TIMED_MODIFICATION_TRACKER_60);
+            return CachedValueProvider.Result.create(collect, FileIndexCaches.getModificationTrackerForIndexId(project, TwigIncludeStubIndex.KEY));
         }, false);
     }
 
@@ -2885,7 +2886,7 @@ public static List<String> getExtendsTemplateUsageAsOrderedList(@NotNull Project
                 .limit(100)
                 .collect(Collectors.toList());
 
-            return CachedValueProvider.Result.create(collect, TimeSecondModificationTracker.TIMED_MODIFICATION_TRACKER_60);
+            return CachedValueProvider.Result.create(collect, FileIndexCaches.getModificationTrackerForIndexId(project, TwigExtendsStubIndex.KEY));
         }, false);
     }