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

consider GlobalSearchScope when indexing unsaved docs

Browse Source
This commit is contained in:
Eugene Zhuravlev
2009-10-08 15:34:32 +04:00
parent 8866bda1f6
commit eebf87db27
1 changed files with 14 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
+14 -7
View File
@@ -549,7 +549,7 @@ public class FileBasedIndex implements ApplicationComponent {
try {
checkRebuild(indexId, false);
myChangedFilesUpdater.forceUpdate(filter);
indexUnsavedDocuments(indexId, project);
indexUnsavedDocuments(indexId, project, filter);
}
catch (StorageException e) {
scheduleRebuild(indexId, e);
@@ -917,7 +917,7 @@ public class FileBasedIndex implements ApplicationComponent {
return docs;
}
private void indexUnsavedDocuments(ID<?, ?> indexId, Project project) throws StorageException {
private void indexUnsavedDocuments(ID<?, ?> indexId, Project project, GlobalSearchScope filter) throws StorageException {
if (myUpToDateIndices.contains(indexId)) {
return; // no need to index unsaved docs
@@ -928,11 +928,12 @@ public class FileBasedIndex implements ApplicationComponent {
// now index unsaved data
final StorageGuard.Holder guard = setDataBufferingEnabled(true);
try {
boolean allDocsProcessed = true;
final Semaphore semaphore = myUnsavedDataIndexingSemaphores.get(indexId);
semaphore.down();
try {
for (Document document : documents) {
indexUnsavedDocument(document, indexId, project);
allDocsProcessed &= indexUnsavedDocument(document, indexId, project, filter);
}
}
finally {
@@ -943,7 +944,9 @@ public class FileBasedIndex implements ApplicationComponent {
break; // hack. Most probably that other indexing threads is waiting for PsiLock, which we're are holding.
}
}
myUpToDateIndices.add(indexId); // safe to set the flag here, becase it will be cleared under the WriteAction
if (allDocsProcessed) {
myUpToDateIndices.add(indexId); // safe to set the flag here, becase it will be cleared under the WriteAction
}
}
}
finally {
@@ -996,12 +999,15 @@ public class FileBasedIndex implements ApplicationComponent {
}
}
private void indexUnsavedDocument(final Document document, final ID<?, ?> requestedIndexId, Project project) throws StorageException {
// returns false if doc was not indexed because the file does not fit in scope
private boolean indexUnsavedDocument(final Document document, final ID<?, ?> requestedIndexId, Project project, GlobalSearchScope filter) throws StorageException {
final VirtualFile vFile = myFileDocumentManager.getFile(document);
if (!(vFile instanceof VirtualFileWithId) || !vFile.isValid()) {
return;
return true;
}
if (filter != null && !filter.accept(vFile)) {
return false;
}
final PsiFile dominantContentFile = findDominantPsiForDocument(document, project);
DocumentContent content;
@@ -1036,6 +1042,7 @@ public class FileBasedIndex implements ApplicationComponent {
dominantContentFile.putUserData(PsiFileImpl.BUILDING_STUB, null);
}
}
return true;
}
public static final Key<PsiFile> PSI_FILE = new Key<PsiFile>("PSI for stubs");