azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Performance hit in getModulesWithKotlinFiles(Project) after git update (KT-4809)

Browse Source 
- Wait for indices are ready
- Try to do only one final check
- Better method to check Kotlin files are present in modules

 #KT-4809 Fixed
 #KT-4875 Fixed
This commit is contained in:
Nikolay Krasko
2014-04-21 16:47:01 +04:00
parent 9127902a28
commit 3a5592ee34
2 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
+9 -4
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.search.FileTypeIndex;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.JetFileType;
@@ -54,11 +55,11 @@ public class ConfigureKotlinInProjectUtils {
}
public static boolean hasKotlinFilesInSources(@NotNull Module module) {
return !FileTypeIndex.getFiles(JetFileType.INSTANCE, module.getModuleScope(false)).isEmpty();
return FileTypeIndex.containsFileOfType(JetFileType.INSTANCE, module.getModuleScope(false));
}
public static boolean hasKotlinFilesOnlyInTests(@NotNull Module module) {
return !hasKotlinFilesInSources(module) && !FileTypeIndex.getFiles(JetFileType.INSTANCE, module.getModuleScope(true)).isEmpty();
return !hasKotlinFilesInSources(module) && FileTypeIndex.containsFileOfType(JetFileType.INSTANCE, module.getModuleScope(true));
}
public static Collection<Module> getModulesWithKotlinFiles(@NotNull Project project) {
@@ -66,12 +67,17 @@ public class ConfigureKotlinInProjectUtils {
return Collections.emptyList();
}
if (!FileTypeIndex.containsFileOfType(JetFileType.INSTANCE, GlobalSearchScope.projectScope(project))) {
return Collections.emptyList();
}
List<Module> modulesWithKotlin = Lists.newArrayList();
for (Module module : ModuleManager.getInstance(project).getModules()) {
if (hasKotlinFilesInSources(module) || hasKotlinFilesOnlyInTests(module)) {
if (FileTypeIndex.containsFileOfType(JetFileType.INSTANCE, module.getModuleScope(true))) {
modulesWithKotlin.add(module);
}
}
return modulesWithKotlin;
}
@@ -88,7 +94,6 @@ public class ConfigureKotlinInProjectUtils {
}
private static void showConfigureKotlinNotification(@NotNull Project project) {
//noinspection StaticFieldReferencedViaSubclass
ConfigureKotlinNotificationManager.instance$.notify(project);
}
idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java
+28 -12
View File
@@ -20,7 +20,6 @@ import com.google.common.collect.Sets;
import com.intellij.ProjectTopics;
import com.intellij.notification.NotificationDisplayType;
import com.intellij.notification.NotificationsConfiguration;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.DumbService;
@@ -32,6 +31,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.newvfs.BulkFileListener;
import com.intellij.openapi.vfs.newvfs.events.*;
import com.intellij.util.Alarm;
import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.configuration.AbsentSdkAnnotationsNotificationManager;
@@ -43,9 +43,11 @@ import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
public static final String EXTERNAL_ANNOTATIONS_GROUP_ID = "Kotlin External annotations";
private volatile Alarm notificationAlarm;
protected AbsentJdkAnnotationsComponent(Project project) {
super(project);
@@ -58,6 +60,9 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
public void projectOpened() {
super.projectOpened();
MessageBusConnection connection = myProject.getMessageBus().connect();
notificationAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, myProject);
connection.subscribe(DumbService.DUMB_MODE, new DumbService.DumbModeListener() {
@Override
public void enteredDumbMode() {
@@ -65,13 +70,14 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
@Override
public void exitDumbMode() {
showNotificationIfNeeded();
scheduleNotificationCheck();
}
});
connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() {
@Override
public void rootsChanged(ModuleRootEvent event) {
showNotificationIfNeeded();
scheduleNotificationCheck();
}
});
@@ -81,7 +87,7 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
for (VFileEvent event : events) {
if (event instanceof VFileCreateEvent || event instanceof VFileDeleteEvent ||
event instanceof VFileMoveEvent || event instanceof VFileCopyEvent) {
showNotificationIfNeeded();
scheduleNotificationCheck();
break;
}
}
@@ -89,17 +95,27 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
});
}
public void showNotificationIfNeeded() {
ApplicationManager.getApplication().invokeLater(new Runnable() {
private void scheduleNotificationCheck() {
if (notificationAlarm.isDisposed()) {
return;
}
notificationAlarm.cancelAllRequests();
notificationAlarm.addRequest(new Runnable() {
@Override
public void run() {
Collection<Sdk> sdks = collectSdksWithoutAnnotations();
if (sdks.isEmpty()) return;
//noinspection StaticFieldReferencedViaSubclass
AbsentSdkAnnotationsNotificationManager.instance$.notify(myProject, sdks);
DumbService.getInstance(myProject).smartInvokeLater(new Runnable() {
@Override
public void run() {
Collection<Sdk> sdks = collectSdksWithoutAnnotations();
if (!sdks.isEmpty()) {
AbsentSdkAnnotationsNotificationManager.instance$.notify(myProject, sdks);
}
}
});
}
});
}, TimeUnit.SECONDS.toMillis(1));
}
@NotNull