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

ensure pushers are run before initial indexing, don't rely on chance

Browse Source
This commit is contained in:
peter
2014-05-01 08:26:45 +02:00
parent 4c1dc509da
commit cbf1c1e29d
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java
+18 -17
View File
@@ -79,10 +79,6 @@ public class PushedFilePropertiesUpdater {
StartupManager.getInstance(project).registerPreStartupActivity(new Runnable() {
@Override
public void run() {
long l = System.currentTimeMillis();
pushAll(myPushers);
LOG.info("File properties pushed in " + (System.currentTimeMillis() - l) + " ms");
final MessageBusConnection connection = bus.connect();
connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() {
@Override
@@ -121,23 +117,28 @@ public class PushedFilePropertiesUpdater {
doPushRecursively(file, pushers, ProjectRootManager.getInstance(myProject).getFileIndex());
}
}));
for (final FilePropertyPusher pusher : myPushers) {
pusher.initExtra(project, bus, new FilePropertyPusher.Engine() {
@Override
public void pushAll() {
PushedFilePropertiesUpdater.this.pushAll(pusher);
}
@Override
public void pushRecursively(VirtualFile file, Project project) {
PushedFilePropertiesUpdater.this.schedulePushRecursively(file, pusher);
}
});
}
}
});
}
public void initializeProperties() {
pushAll(myPushers);
for (final FilePropertyPusher pusher : myPushers) {
pusher.initExtra(myProject, myProject.getMessageBus(), new FilePropertyPusher.Engine() {
@Override
public void pushAll() {
PushedFilePropertiesUpdater.this.pushAll(pusher);
}
@Override
public void pushRecursively(VirtualFile file, Project project) {
PushedFilePropertiesUpdater.this.schedulePushRecursively(file, pusher);
}
});
}
}
private void schedulePushRecursively(final VirtualFile dir, final FilePropertyPusher... pushers) {
if (pushers.length == 0) return;
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
+3
View File
@@ -32,6 +32,7 @@ import com.intellij.openapi.roots.ContentIterator;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ex.ProjectRootManagerEx;
import com.intellij.openapi.roots.impl.ProjectRootManagerComponent;
import com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
@@ -72,6 +73,8 @@ public class FileBasedIndexProjectHandler extends AbstractProjectComponent imple
startupManager.registerPreStartupActivity(new Runnable() {
@Override
public void run() {
PushedFilePropertiesUpdater.getInstance(project).initializeProperties();
// dumb mode should start before post-startup activities
// only when queueTask is called from UI thread, we can guarantee that
// when the method returns, the application has entered dumb mode