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

Notifications about unsupported ABI versions

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-25 19:32:24 +04:00
parent 5a09d3a6b5
commit 341bd3a555
3 changed files with 163 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
+148 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
package org.jetbrains.jet.plugin.quickfix;
import com.intellij.ProjectTopics;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -23,33 +25,61 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileChooser.FileChooserFactory;
import com.intellij.openapi.fileChooser.FileTextField;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleRootAdapter;
import com.intellij.openapi.roots.ModuleRootEvent;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.EditorNotificationPanel;
import com.intellij.ui.EditorNotifications;
import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification;
import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.Collection;
public class ConfigureKotlinLibraryNotificationProvider extends EditorNotifications.Provider<EditorNotificationPanel> {
private static final Key<EditorNotificationPanel> KEY = Key.create("configure.kotlin.library");
private final Project myProject;
private final Runnable updateNotifications = new Runnable() {
@Override
public void run() {
updateNotifications();
}
};
public ConfigureKotlinLibraryNotificationProvider(Project project) {
myProject = project;
MessageBusConnection connection = myProject.getMessageBus().connect();
connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() {
@Override
public void rootsChanged(ModuleRootEvent event) {
DumbService.getInstance(myProject).runWhenSmart(updateNotifications);
}
});
}
@Override
@@ -69,21 +99,26 @@ public class ConfigureKotlinLibraryNotificationProvider extends EditorNotificati
if (module == null) return null;
if (!KotlinRuntimeLibraryUtil.isModuleAlreadyConfigured(module)) {
return createNotificationPanel(module);
return createConfigureRuntimeLibraryNotificationPanel(module);
}
Collection<VirtualFile> badRoots = KotlinRuntimeLibraryUtil.getLibraryRootsWithAbiIncompatibleKotlinClasses(myProject);
if (!badRoots.isEmpty()) {
return createUnsupportedAbiVersionNotificationPanel(badRoots);
}
}
catch (ProcessCanceledException e) {
// Ignore
}
catch (IndexNotReadyException e) {
// Ignore
DumbService.getInstance(myProject).runWhenSmart(updateNotifications);
return null;
}
return null;
}
private EditorNotificationPanel createNotificationPanel(final Module module) {
private EditorNotificationPanel createConfigureRuntimeLibraryNotificationPanel(final Module module) {
final EditorNotificationPanel answer = new EditorNotificationPanel();
answer.setText("Kotlin is not configured for module '" + module.getName() + "'");
@@ -108,21 +143,73 @@ public class ConfigureKotlinLibraryNotificationProvider extends EditorNotificati
Library library = KotlinRuntimeLibraryUtil.findOrCreateRuntimeLibrary(myProject, new UiFindRuntimeLibraryHandler());
if (library == null) return;
KotlinRuntimeLibraryUtil.setUpKotlinRuntimeLibrary(module, library, new Runnable() {
@Override
public void run() {
updateNotifications();
}
});
KotlinRuntimeLibraryUtil.setUpKotlinRuntimeLibrary(module, library, updateNotifications);
}
private void setUpJSModule(@NotNull Module module) {
JsModuleSetUp.doSetUpModule(module, new Runnable() {
JsModuleSetUp.doSetUpModule(module, updateNotifications);
}
private EditorNotificationPanel createUnsupportedAbiVersionNotificationPanel(final Collection<VirtualFile> badRoots) {
final EditorNotificationPanel answer = new ErrorNotificationPanel();
VirtualFile kotlinRuntimeJar = KotlinRuntimeLibraryUtil.getLocalKotlinRuntimeJar(myProject);
if (kotlinRuntimeJar != null && badRoots.contains(kotlinRuntimeJar)) {
int otherBadRootsCount = badRoots.size() - 1;
String kotlinRuntimeJarName = kotlinRuntimeJar.getPresentableName();
String text = MessageFormat.format("<html>Kotlin <b>runtime library</b> jar <b>''{0}''</b> " +
"{1,choice,0#|1# and one other jar|1< and {1} other jars} " +
"{1,choice,0#has|0<have} an unsupported format</html>",
kotlinRuntimeJarName,
otherBadRootsCount);
answer.setText(text);
answer.createActionLabel("Update " + kotlinRuntimeJarName, new Runnable() {
@Override
public void run() {
KotlinRuntimeLibraryUtil.updateRuntime(myProject,
OutdatedKotlinRuntimeNotification.showRuntimeJarNotFoundDialog(myProject));
}
});
if (otherBadRootsCount > 0) {
createShowPathsActionLabel(answer, "Show all");
}
}
else if (badRoots.size() == 1) {
final VirtualFile root = badRoots.iterator().next();
String presentableName = root.getPresentableName();
answer.setText("<html>Kotlin library <b>'" + presentableName + "'</b> " +
"has an unsupported format. Please update the library or the plugin</html>");
answer.createActionLabel("Go to " + presentableName, new Runnable() {
@Override
public void run() {
navigateToLibraryRoot(myProject, root);
}
});
}
else {
answer.setText("Some Kotlin libraries attached to this project have unsupported format. Please update the libraries or the plugin");
createShowPathsActionLabel(answer, "Show paths");
}
return answer;
}
private void createShowPathsActionLabel(EditorNotificationPanel answer, String labelText) {
final Ref<Component> label = new Ref<Component>(null);
Runnable action = new Runnable() {
@Override
public void run() {
updateNotifications();
Collection<VirtualFile> badRoots =
KotlinRuntimeLibraryUtil.getLibraryRootsWithAbiIncompatibleKotlinClasses(myProject);
assert !badRoots.isEmpty() : "This action should only be called when bad roots are present";
LibraryRootsPopupModel listPopupModel = new LibraryRootsPopupModel("Unsupported format", myProject, badRoots);
ListPopup popup = JBPopupFactory.getInstance().createListPopup(listPopupModel);
popup.showUnderneathOf(label.get());
}
});
};
label.set(answer.createActionLabel(labelText, action));
}
private void updateNotifications() {
@@ -188,5 +275,52 @@ public class ConfigureKotlinLibraryNotificationProvider extends EditorNotificati
public void ioExceptionOnCopyingJar(@NotNull IOException e) {
Messages.showErrorDialog(myProject, "Error copying jar: " + e.getLocalizedMessage(), "Error Copying File");
}
}
private static void navigateToLibraryRoot(Project project, @NotNull VirtualFile root) {
new OpenFileDescriptor(project, root).navigate(true);
}
private static class LibraryRootsPopupModel extends BaseListPopupStep<VirtualFile> {
private final Project project;
public LibraryRootsPopupModel(@NotNull String title, @NotNull Project project, @NotNull Collection<VirtualFile> roots) {
super(title, roots.toArray(new VirtualFile[roots.size()]));
this.project = project;
}
@NotNull
@Override
public String getTextFor(VirtualFile root) {
String relativePath = VfsUtilCore.getRelativePath(root, project.getBaseDir(), '/');
return relativePath != null ? relativePath : root.getPath();
}
@Override
public Icon getIconFor(VirtualFile aValue) {
if (aValue.isDirectory()) {
return AllIcons.Nodes.Folder;
}
return AllIcons.FileTypes.Archive;
}
@Override
public PopupStep onChosen(VirtualFile selectedValue, boolean finalChoice) {
navigateToLibraryRoot(project, selectedValue);
return FINAL_CHOICE;
}
@Override
public boolean isSpeedSearchEnabled() {
return true;
}
}
private static class ErrorNotificationPanel extends EditorNotificationPanel {
public ErrorNotificationPanel() {
myLabel.setIcon(AllIcons.General.Error);
}
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/KotlinRuntimeLibraryUtil.java
+2 -3
View File
@@ -222,8 +222,7 @@ public class KotlinRuntimeLibraryUtil {
public static void updateRuntime(
@NotNull final Project project,
@NotNull final Runnable jarNotFoundHandler,
@Nullable final Runnable continuation
@NotNull final Runnable jarNotFoundHandler
) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
@@ -242,7 +241,7 @@ public class KotlinRuntimeLibraryUtil {
catch (IOException e) {
throw new AssertionError(e);
}
runtimeJar.refresh(true, true, continuation);
runtimeJar.refresh(true, true);
}
});
}
idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java
+13 -8
View File
@@ -66,14 +66,7 @@ public class OutdatedKotlinRuntimeNotification extends AbstractProjectComponent
public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) {
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
if ("update".equals(event.getDescription())) {
KotlinRuntimeLibraryUtil.updateRuntime(myProject, new Runnable() {
@Override
public void run() {
Messages.showErrorDialog(myProject,
"kotlin-runtime.jar is not found. Make sure plugin is properly installed.",
"No Runtime Found");
}
}, null);
KotlinRuntimeLibraryUtil.updateRuntime(myProject, showRuntimeJarNotFoundDialog(myProject));
}
else if ("ignore".equals(event.getDescription())) {
PropertiesComponent.getInstance(myProject).setValue(SUPPRESSED_PROPERTY_NAME, pluginVersion);
@@ -86,4 +79,16 @@ public class OutdatedKotlinRuntimeNotification extends AbstractProjectComponent
}
}), myProject);
}
@NotNull
public static Runnable showRuntimeJarNotFoundDialog(@NotNull final Project project) {
return new Runnable() {
@Override
public void run() {
Messages.showErrorDialog(project,
"kotlin-runtime.jar is not found. Make sure plugin is properly installed.",
"No Runtime Found");
}
};
}
}