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

keep track of file being requested to be indexed

Browse Source 
this change allows code to avoid deadlock when FileTypeSubstitutor depends on index value. File being requested to be indexed is returned from FileBasedIndex.getFileBeingCurrentlyIndexed()

GitOrigin-RevId: 8c0170e4076cc64a51dc1196d6924e523eb0ca78
This commit is contained in:
Maxim.Mossienko
2019-10-02 14:35:12 +00:00
committed by intellij-monorepo-bot
parent 56de4eb018
commit 02ab5e6345
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+26 -19
View File
@@ -106,6 +106,7 @@ import java.util.stream.Stream;
*/
public final class FileBasedIndexImpl extends FileBasedIndex {
private static final ThreadLocal<VirtualFile> ourIndexedFile = new ThreadLocal<>();
private static final ThreadLocal<VirtualFile> ourFileToBeIndexed = new ThreadLocal<>();
static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.FileBasedIndexImpl");
private static final String CORRUPTION_MARKER_NAME = "corruption.marker";
private static final NotificationGroup NOTIFICATIONS = new NotificationGroup("Indexing", NotificationDisplayType.BALLOON, false);
@@ -1725,7 +1726,8 @@ public final class FileBasedIndexImpl extends FileBasedIndex {
@Override
public VirtualFile getFileBeingCurrentlyIndexed() {
return ourIndexedFile.get();
VirtualFile file = ourIndexedFile.get();
return file != null ? file : ourFileToBeIndexed.get();
}
private class VirtualFileUpdateTask extends UpdateTask<VirtualFile> {
@@ -1878,28 +1880,33 @@ public final class FileBasedIndexImpl extends FileBasedIndex {
getChangedFilesCollector().removeScheduledFileFromUpdate(file);
}
else {
getFileTypeManager().freezeFileTypeTemporarilyIn(file, () -> {
final List<ID<?, ?>> candidates = getAffectedIndexCandidates(file);
ourFileToBeIndexed.set(file);
try {
getFileTypeManager().freezeFileTypeTemporarilyIn(file, () -> {
final List<ID<?, ?>> candidates = getAffectedIndexCandidates(file);
boolean scheduleForUpdate = false;
boolean scheduleForUpdate = false;
//noinspection ForLoopReplaceableByForEach
for (int i = 0, size = candidates.size(); i < size; ++i) {
final ID<?, ?> indexId = candidates.get(i);
if (needsFileContentLoading(indexId) && getInputFilter(indexId).acceptInput(file)) {
getIndex(indexId).resetIndexedStateForFile(fileId);
scheduleForUpdate = true;
//noinspection ForLoopReplaceableByForEach
for (int i = 0, size = candidates.size(); i < size; ++i) {
final ID<?, ?> indexId = candidates.get(i);
if (needsFileContentLoading(indexId) && getInputFilter(indexId).acceptInput(file)) {
getIndex(indexId).resetIndexedStateForFile(fileId);
scheduleForUpdate = true;
}
}
}
if (scheduleForUpdate) {
IndexingStamp.flushCache(fileId);
getChangedFilesCollector().scheduleForUpdate(file);
}
else if (file instanceof VirtualFileSystemEntry) {
((VirtualFileSystemEntry)file).setFileIndexed(true);
}
});
if (scheduleForUpdate) {
IndexingStamp.flushCache(fileId);
getChangedFilesCollector().scheduleForUpdate(file);
}
else if (file instanceof VirtualFileSystemEntry) {
((VirtualFileSystemEntry)file).setFileIndexed(true);
}
});
} finally {
ourFileToBeIndexed.remove();
}
}
}
}