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

SSR: Allow to use in limited way in dumb mode

Browse Source 
GitOrigin-RevId: f250ed85a319ecb8db3696d20acf6650f962b90e
This commit is contained in:
Bas Leijdekkers
2020-01-02 22:03:38 +00:00
committed by intellij-monorepo-bot
parent becc02bcf0
commit fa4dde54cb
2 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspectionOptions.java
+46 -48
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.structuralsearch.inspection.highlightTemplate;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
@@ -7,7 +7,6 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.structuralsearch.SSRBundle;
@@ -16,6 +15,7 @@ import com.intellij.ui.AnActionButton;
import com.intellij.ui.AnActionButtonRunnable;
import com.intellij.ui.DoubleClickListener;
import com.intellij.ui.ToolbarDecorator;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.components.JBList;
import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ public class SSBasedInspectionOptions {
// for externalization
final List<Configuration> myConfigurations;
public SSBasedInspectionOptions(final List<Configuration> configurations) {
SSBasedInspectionOptions(final List<Configuration> configurations) {
myConfigurations = configurations;
myTemplatesList = new JBList<>(new MyListModel());
myTemplatesList.setCellRenderer(new DefaultListCellRenderer() {
@@ -46,14 +46,6 @@ public class SSBasedInspectionOptions {
});
}
void addTemplate(Configuration configuration, Project project) {
if (!ConfigurationManager.showSaveTemplateAsDialog(myConfigurations, configuration, project)) {
return;
}
configurationsChanged(project);
}
public void configurationsChanged(Project project) {
((MyListModel)myTemplatesList.getModel()).fireContentsChanged();
DaemonCodeAnalyzer.getInstance(project).restart();
@@ -68,47 +60,46 @@ public class SSBasedInspectionOptions {
@Override
public void run(AnActionButton button) {
final AnAction[] children = new AnAction[]{new AddTemplateAction(false), new AddTemplateAction(true)};
final RelativePoint point = button.getPreferredPopupPoint();
if (point == null) return;
JBPopupFactory.getInstance().createActionGroupPopup(null, new DefaultActionGroup(children),
DataManager.getInstance().getDataContext(button.getContextComponent()),
JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, true)
.show(button.getPreferredPopupPoint());
.show(point);
}
}).setEditAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(panel));
if (project != null && !DumbService.isDumb(project)) {
performEditAction(project);
})
.setEditAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(panel));
if (project != null) {
performEditAction(project);
}
}
}
}).setEditActionUpdater(e -> {
final Project project = e.getProject();
return project != null && !DumbService.isDumb(project);
}).setRemoveAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(panel));
if (project == null) return;
for (Configuration configuration : myTemplatesList.getSelectedValuesList()) {
myConfigurations.remove(configuration);
})
.setRemoveAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(panel));
if (project == null) return;
for (Configuration configuration : myTemplatesList.getSelectedValuesList()) {
myConfigurations.remove(configuration);
}
configurationsChanged(project);
}
configurationsChanged(project);
}
}).setRemoveActionUpdater(e -> {
final Project project = e.getProject();
return project != null && !DumbService.isDumb(project);
})
})
.setMoveUpAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
performMoveUpDown(false);
}
}).setMoveDownAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
performMoveUpDown(true);
}
})
@Override
public void run(AnActionButton button) {
performMoveUpDown(false);
}
})
.setMoveDownAction(new AnActionButtonRunnable() {
@Override
public void run(AnActionButton button) {
performMoveUpDown(true);
}
})
.setPreferredSize(new Dimension(-1, 100))
.createPanel()
);
@@ -116,9 +107,7 @@ public class SSBasedInspectionOptions {
@Override
protected boolean onDoubleClick(MouseEvent e) {
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(panel));
if (project != null && !DumbService.isDumb(project)) {
performEditAction(project);
}
performEditAction(project);
return true;
}
}.installOn(myTemplatesList);
@@ -194,5 +183,14 @@ public class SSBasedInspectionOptions {
if (!dialog.showAndGet()) return;
addTemplate(dialog.getConfiguration(), e.getProject());
}
void addTemplate(Configuration configuration, Project project) {
if (!ConfigurationManager.showSaveTemplateAsDialog(myConfigurations, configuration, project)) {
return;
}
((MyListModel)myTemplatesList.getModel()).fireContentsChanged();
DaemonCodeAnalyzer.getInstance(project).restart();
}
}
}
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/StructuralSearchAction.java
+3 -3
View File
@@ -1,9 +1,9 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.structuralsearch.plugin;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.wm.IdeFocusManager;
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
public class StructuralSearchAction extends AnAction {
public class StructuralSearchAction extends DumbAwareAction {
@Override
public void actionPerformed(@NotNull AnActionEvent event) {