Add bookmarks from the diff invoked from commit dialog IDEA-169296

This commit is contained in:
Kirill Likhodedov
2017-03-08 11:12:37 +00:00
parent 946aa9fa20
commit b5addab806
@@ -26,7 +26,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.PopupChooserBuilder;
import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.DimensionService; import com.intellij.openapi.util.DimensionService;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
@@ -39,7 +38,6 @@ import com.intellij.ui.popup.util.ItemWrapper;
import com.intellij.ui.popup.util.MasterDetailPopupBuilder; import com.intellij.ui.popup.util.MasterDetailPopupBuilder;
import com.intellij.ui.speedSearch.FilteringListModel; import com.intellij.ui.speedSearch.FilteringListModel;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -58,6 +56,10 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
private JBPopup myPopup; private JBPopup myPopup;
public BookmarksAction() {
setEnabledInModalContext(true);
}
@Override @Override
public void update(@NotNull AnActionEvent e) { public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(e.getProject() != null); e.getPresentation().setEnabled(e.getProject() != null);