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

IDEA-105708 "Annotate" command works incorrectly

Browse Source
This commit is contained in:
peter
2013-06-18 14:03:50 +02:00
parent d9b66c266d
commit 8bef182ed5
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+26 -4
View File
@@ -101,7 +101,25 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
public boolean isSelected(AnActionEvent e) {
VcsContext context = VcsContextFactory.SERVICE.getInstance().createContextOn(e);
Editor editor = context.getEditor();
if (editor == null) return false;
if (editor != null) {
return isAnnotated(editor);
}
VirtualFile selectedFile = context.getSelectedFile();
if (selectedFile == null) {
return false;
}
for (FileEditor fileEditor : FileEditorManager.getInstance(context.getProject()).getEditors(selectedFile)) {
if (fileEditor instanceof TextEditor) {
if (isAnnotated(((TextEditor)fileEditor).getEditor())) {
return true;
}
}
}
return false;
}
private static boolean isAnnotated(@NotNull Editor editor) {
Collection annotations = editor.getUserData(KEY_IN_EDITOR);
return annotations != null && !annotations.isEmpty();
}
@@ -109,14 +127,18 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
public void setSelected(AnActionEvent e, boolean selected) {
final VcsContext context = VcsContextFactory.SERVICE.getInstance().createContextOn(e);
Editor editor = context.getEditor();
VirtualFile selectedFile = context.getSelectedFile();
if (selectedFile == null) return;
if (!selected) {
if (editor != null) {
editor.getGutter().closeAllAnnotations();
for (FileEditor fileEditor : FileEditorManager.getInstance(context.getProject()).getEditors(selectedFile)) {
if (fileEditor instanceof TextEditor) {
((TextEditor)fileEditor).getEditor().getGutter().closeAllAnnotations();
}
}
}
else {
if (editor == null) {
VirtualFile selectedFile = context.getSelectedFile();
FileEditor[] fileEditors = FileEditorManager.getInstance(context.getProject()).openFile(selectedFile, false);
for (FileEditor fileEditor : fileEditors) {
if (fileEditor instanceof TextEditor) {