MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

if FileBasedIndex.processValues is invoked with virtual file restricted (out of scope) then indexUnsavedDocument should index its current content

Browse Source
This commit is contained in:
Maxim.Mossienko
2011-11-23 18:13:12 +04:00
parent 5f14412803
commit d802d6487e
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+13 -7
View File
@@ -741,6 +741,11 @@ public class FileBasedIndex implements ApplicationComponent {
* The method is internal to indexing engine end is called internally. The method is public due to implementation details
*/
public <K> void ensureUpToDate(final ID<K, ?> indexId, @Nullable Project project, @Nullable GlobalSearchScope filter) {
ensureUpToDate(indexId, project, filter, null);
}
private <K> void ensureUpToDate(final ID<K, ?> indexId, @Nullable Project project, @Nullable GlobalSearchScope filter,
@Nullable VirtualFile restrictedFile) {
if (!needsFileContentLoading(indexId)) {
return; //indexed eagerly in foreground while building unindexed file list
}
@@ -760,7 +765,7 @@ public class FileBasedIndex implements ApplicationComponent {
try {
checkRebuild(indexId, false);
myChangedFilesCollector.forceUpdate(project, filter, false);
indexUnsavedDocuments(indexId, project, filter);
indexUnsavedDocuments(indexId, project, filter, restrictedFile);
}
catch (StorageException e) {
scheduleRebuild(indexId, e);
@@ -867,7 +872,7 @@ public class FileBasedIndex implements ApplicationComponent {
}
final Project project = filter.getProject();
//assert project != null : "GlobalSearchScope#getProject() should be not-null for all index queries";
ensureUpToDate(indexId, project, filter);
ensureUpToDate(indexId, project, filter, restrictToFile);
final Lock readLock = index.getReadLock();
try {
@@ -1114,8 +1119,8 @@ public class FileBasedIndex implements ApplicationComponent {
return docs;
}
private void indexUnsavedDocuments(ID<?, ?> indexId, @Nullable Project project, GlobalSearchScope filter) throws StorageException {
private void indexUnsavedDocuments(ID<?, ?> indexId, @Nullable Project project, GlobalSearchScope filter,
VirtualFile restrictedFile) throws StorageException {
if (myUpToDateIndices.contains(indexId)) {
return; // no need to index unsaved docs
}
@@ -1133,7 +1138,7 @@ public class FileBasedIndex implements ApplicationComponent {
boolean allDocsProcessed = true;
try {
for (Document document : documents) {
allDocsProcessed &= indexUnsavedDocument(document, indexId, project, filter);
allDocsProcessed &= indexUnsavedDocument(document, indexId, project, filter, restrictedFile);
}
}
finally {
@@ -1210,12 +1215,13 @@ public class FileBasedIndex implements ApplicationComponent {
}
// returns false if doc was not indexed because the file does not fit in scope
private boolean indexUnsavedDocument(@NotNull final Document document, @NotNull final ID<?, ?> requestedIndexId, final Project project, GlobalSearchScope filter) throws StorageException {
private boolean indexUnsavedDocument(@NotNull final Document document, @NotNull final ID<?, ?> requestedIndexId, final Project project,
GlobalSearchScope filter, VirtualFile restrictedFile) throws StorageException {
final VirtualFile vFile = myFileDocumentManager.getFile(document);
if (!(vFile instanceof VirtualFileWithId) || !vFile.isValid()) {
return true;
}
if (filter != null && !filter.accept(vFile)) {
if (filter != null && (!filter.accept(vFile) && vFile != restrictedFile)) {
return false;
}
final PsiFile dominantContentFile = findDominantPsiForDocument(document, project);