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

diff: allow to show/hide annotations with VCS action popup

Browse Source 
* copy behaviour of AnnotateToggleAction
This commit is contained in:
Aleksey Pivovarov
2015-09-03 19:28:14 +03:00
parent 5fa89b8885
commit f0d88932cf
2 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateDiffViewerAction.java
+77 -24
View File
@@ -31,18 +31,19 @@ import com.intellij.diff.tools.util.side.OnesideTextDiffViewer;
import com.intellij.diff.tools.util.side.TwosideTextDiffViewer;
import com.intellij.diff.util.BackgroundTaskUtil;
import com.intellij.diff.util.Side;
import com.intellij.icons.AllIcons;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationType;
import com.intellij.notification.impl.NotificationsManagerImpl;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.EmptyAction;
import com.intellij.openapi.actionSystem.ToggleAction;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.localVcs.UpToDateLineNumberProvider;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.util.Disposer;
@@ -78,7 +79,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
public class AnnotateDiffViewerAction extends DumbAwareAction {
public class AnnotateDiffViewerAction extends ToggleAction implements DumbAware {
public static final Logger LOG = Logger.getInstance(AnnotateDiffViewerAction.class);
private static final Key<AnnotationData[]> CACHE_KEY = Key.create("Diff.AnnotateAction.Cache");
@@ -89,12 +90,13 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
};
public AnnotateDiffViewerAction() {
super("Annotate", null, AllIcons.Actions.Annotate);
EmptyAction.setupAction(this, "Annotate", null);
setEnabledInModalContext(true);
}
@Override
public void update(AnActionEvent e) {
super.update(e);
e.getPresentation().setEnabledAndVisible(isEnabled(e));
}
@@ -106,41 +108,61 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
return null;
}
private static boolean isEnabled(AnActionEvent e) {
@Nullable
private static EventData collectEventData(AnActionEvent e) {
DiffViewerBase viewer = ObjectUtils.tryCast(e.getData(DiffDataKeys.DIFF_VIEWER), DiffViewerBase.class);
if (viewer == null) return false;
if (viewer.getProject() == null) return false;
if (viewer.isDisposed()) return false;
if (viewer == null) return null;
if (viewer.getProject() == null) return null;
if (viewer.isDisposed()) return null;
Editor editor = e.getData(CommonDataKeys.EDITOR);
if (editor == null) return false;
if (editor == null) return null;
ViewerAnnotator annotator = getAnnotator(viewer);
if (annotator == null) return false;
if (annotator == null) return null;
//noinspection unchecked
Side side = annotator.getCurrentSide(viewer, editor);
if (side == null) return false;
if (side == null) return null;
return new EventData(viewer, editor, annotator, side);
}
public static boolean isEnabled(AnActionEvent e) {
EventData data = collectEventData(e);
if (data == null) return false;
//noinspection unchecked
if (annotator.isAnnotationShown(viewer, side)) return false;
if (checkRunningProgress(viewer, side)) return false;
return createAnnotationsLoader(viewer.getProject(), viewer.getRequest(), side) != null;
if (data.annotator.isAnnotationShown(data.viewer, data.side)) return true;
if (checkRunningProgress(data.viewer, data.side)) return false;
return createAnnotationsLoader(data.viewer.getProject(), data.viewer.getRequest(), data.side) != null;
}
public static void perform(AnActionEvent e) {
EventData data = collectEventData(e);
assert data != null;
//noinspection unchecked
boolean annotationShown = data.annotator.isAnnotationShown(data.viewer, data.side);
if (annotationShown) {
//noinspection unchecked
data.annotator.hideAnnotation(data.viewer, data.side);
}
else {
doAnnotate(data.annotator, data.viewer, data.side);
}
}
@Override
public void actionPerformed(final AnActionEvent e) {
DiffViewerBase viewer = (DiffViewerBase)e.getRequiredData(DiffDataKeys.DIFF_VIEWER);
Editor editor = e.getRequiredData(CommonDataKeys.EDITOR);
ViewerAnnotator annotator = getAnnotator(viewer);
assert annotator != null;
public boolean isSelected(AnActionEvent e) {
EventData data = collectEventData(e);
//noinspection unchecked
Side side = annotator.getCurrentSide(viewer, editor);
assert side != null;
return data != null && data.annotator.isAnnotationShown(data.viewer, data.side);
}
doAnnotate(annotator, viewer, side);
@Override
public void setSelected(AnActionEvent e, boolean state) {
perform(e);
}
public static <T extends DiffViewerBase> void doAnnotate(@NotNull final ViewerAnnotator<T> annotator,
@@ -391,6 +413,11 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
Project project = ObjectUtils.assertNotNull(viewer.getProject());
AnnotateToggleAction.doAnnotate(viewer.getEditor(side), project, null, data.annotation, data.vcs, null);
}
@Override
public void hideAnnotation(@NotNull TwosideTextDiffViewer viewer, @NotNull Side side) {
viewer.getEditor(side).getGutter().closeAllAnnotations();
}
}
private static class OnesideAnnotator extends ViewerAnnotator<OnesideTextDiffViewer> {
@@ -419,6 +446,11 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
Project project = ObjectUtils.assertNotNull(viewer.getProject());
AnnotateToggleAction.doAnnotate(viewer.getEditor(), project, null, data.annotation, data.vcs, null);
}
@Override
public void hideAnnotation(@NotNull OnesideTextDiffViewer viewer, @NotNull Side side) {
viewer.getEditor().getGutter().closeAllAnnotations();
}
}
private static class UnifiedAnnotator extends ViewerAnnotator<UnifiedDiffViewer> {
@@ -448,6 +480,11 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
UnifiedUpToDateLineNumberProvider lineNumberProvider = new UnifiedUpToDateLineNumberProvider(viewer, side);
AnnotateToggleAction.doAnnotate(viewer.getEditor(), project, null, data.annotation, data.vcs, lineNumberProvider);
}
@Override
public void hideAnnotation(@NotNull UnifiedDiffViewer viewer, @NotNull Side side) {
viewer.getEditor().getGutter().closeAllAnnotations();
}
}
private static class UnifiedUpToDateLineNumberProvider implements UpToDateLineNumberProvider {
@@ -495,6 +532,8 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
public abstract boolean isAnnotationShown(@NotNull T viewer, @NotNull Side side);
public abstract void showAnnotation(@NotNull T viewer, @NotNull Side side, @NotNull AnnotationData data);
public abstract void hideAnnotation(@NotNull T viewer, @NotNull Side side);
}
private abstract static class FileAnnotationLoader {
@@ -564,4 +603,18 @@ public class AnnotateDiffViewerAction extends DumbAwareAction {
private static Object key(@NotNull DiffViewer viewer, @NotNull Side side) {
return Pair.create(viewer, side);
}
private static class EventData {
@NotNull public final DiffViewerBase viewer;
@NotNull public final Editor editor;
@NotNull public final ViewerAnnotator annotator;
@NotNull public final Side side;
public EventData(@NotNull DiffViewerBase viewer, @NotNull Editor editor, @NotNull ViewerAnnotator annotator, @NotNull Side side) {
this.viewer = viewer;
this.editor = editor;
this.annotator = annotator;
this.side = side;
}
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+8 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.vcs.actions;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Separator;
import com.intellij.openapi.actionSystem.ToggleAction;
@@ -62,7 +63,8 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
@Override
public void update(@NotNull AnActionEvent e) {
super.update(e);
final boolean enabled = isEnabled(VcsContextFactory.SERVICE.getInstance().createContextOn(e));
final boolean enabled = isEnabled(VcsContextFactory.SERVICE.getInstance().createContextOn(e)) ||
AnnotateDiffViewerAction.isEnabled(e);
e.getPresentation().setEnabled(enabled);
}
@@ -127,6 +129,11 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
@Override
public void setSelected(AnActionEvent e, boolean selected) {
if (AnnotateDiffViewerAction.isEnabled(e)) {
AnnotateDiffViewerAction.perform(e);
return;
}
final VcsContext context = VcsContextFactory.SERVICE.getInstance().createContextOn(e);
Editor editor = context.getEditor();
VirtualFile selectedFile = context.getSelectedFile();