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

smart sync of pooled threads on start

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-02-13 17:32:48 +01:00
parent 0f1d2103db
commit 0e862f9cf5
1 changed files with 65 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+65 -30
View File
@@ -158,6 +158,8 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
private static AtomicLong ourLastTimePressed = new AtomicLong(0);
private static AtomicBoolean showAll = new AtomicBoolean(false);
private ArrayList<VirtualFile> myAlreadyAddedFiles = new ArrayList<VirtualFile>();
private ArrayList<AnAction> myAlreadyAddedActions = new ArrayList<AnAction>();
private volatile ActionCallback myCurrentWorker = ActionCallback.DONE;
private int myHistoryIndex = 0;
static {
@@ -606,15 +608,20 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
private void rebuildList(final String pattern) {
if (myCalcThread != null) {
myCalcThread.cancel();
if (myCalcThread != null && !myCurrentWorker.isProcessed()) {
myCurrentWorker = myCalcThread.cancel();
}
final Project project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(getField().getTextEditor()));
assert project != null;
myRenderer.myProject = project;
myCalcThread = new CalcThread(project, pattern);
myCalcThread.start();
myCurrentWorker.doWhenProcessed(new Runnable() {
@Override
public void run() {
myCalcThread = new CalcThread(project, pattern);
myCurrentWorker = myCalcThread.start();
}
});
}
@Override
@@ -630,6 +637,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
rebuildList(myPopupField.getText());
return;
}
myCurrentWorker = ActionCallback.DONE;
if (e != null) {
myEditor = e.getData(CommonDataKeys.EDITOR);
myFile = e.getData(CommonDataKeys.PSI_FILE);
@@ -653,6 +661,13 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
Disposer.dispose(myPopupField);
}
myPopupField = new MySearchTextField();
myPopupField.getTextEditor().addKeyListener(new KeyAdapter() {
@Override
public void keyTyped(KeyEvent e) {
myHistoryIndex = 0;
myHistoryItem = null;
}
});
initSearchField(myPopupField);
myPopupField.setOpaque(false);
final JTextField editor = myPopupField.getTextEditor();
@@ -1102,6 +1117,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
private final Project project;
private final String pattern;
private ProgressIndicator myProgressIndicator = new ProgressIndicatorBase();
private final ActionCallback myDone = new ActionCallback();
public CalcThread(Project project, String pattern) {
this.project = project;
@@ -1111,28 +1127,32 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public void run() {
try {
myList.getEmptyText().setText("Searching...");
check();
//noinspection SSBasedInspection
UIUtil.invokeLaterIfNeeded(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
myList.getEmptyText().setText("Searching...");
myTitleIndexes.clear();
clearModel();
myAlreadyAddedFiles.clear();
myAlreadyAddedActions.clear();
}
});
if (pattern.trim().length() == 0) {
buildModelFromRecentFiles();
updatePopup();
return;
}
checkModelsUpToDate();
buildTopHit(pattern);
buildRecentFiles(pattern);
updatePopup();
buildToolWindows(pattern);
updatePopup();
checkModelsUpToDate(); check();
buildTopHit(pattern); check();
buildRecentFiles(pattern); check();
updatePopup(); check();
buildToolWindows(pattern); check();
updatePopup(); check();
if (!DumbServiceImpl.getInstance(project).isDumb()) {
ApplicationManager.getApplication().runReadAction(new Runnable() {
@@ -1163,13 +1183,22 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
updatePopup();
}
catch (Exception ignore) {
ignore.printStackTrace();
myDone.setRejected();
}
finally {
myList.getEmptyText().setText(StatusText.DEFAULT_EMPTY_TEXT);
if (!myProgressIndicator.isCanceled()) {
myList.getEmptyText().setText(StatusText.DEFAULT_EMPTY_TEXT);
}
if (!myDone.isProcessed()) {
myDone.setDone();
}
}
}
protected void check() {
myProgressIndicator.checkCanceled();
}
private void buildToolWindows(String pattern) {
if (myActions == null) {
myActions = myActionModel.getNames(true);
@@ -1177,17 +1206,17 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
final HashSet<AnAction> toolWindows = new HashSet<AnAction>();
List<MatchResult> matches = collectResults(pattern, myActions, myActionModel);
for (MatchResult o : matches) {
myProgressIndicator.checkCanceled();
check();
Object[] objects = myActionModel.getElementsByName(o.elementName, true, pattern);
for (Object object : objects) {
myProgressIndicator.checkCanceled();
check();
if (isToolWindowAction(object) && toolWindows.size() < MAX_TOOL_WINDOWS) {
toolWindows.add((AnAction)((Map.Entry)object).getKey());
}
}
}
myProgressIndicator.checkCanceled();
check();
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
@@ -1214,10 +1243,10 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
List<MatchResult> matches = collectResults(pattern, myActions, myActionModel);
for (MatchResult o : matches) {
myProgressIndicator.checkCanceled();
check();
Object[] objects = myActionModel.getElementsByName(o.elementName, true, pattern);
for (Object object : objects) {
myProgressIndicator.checkCanceled();
check();
if (isSetting(object) && settings.size() < MAX_SETTINGS) {
if (matcher.matches(getSettingText((OptionDescription)object))) {
settings.add(object);
@@ -1229,7 +1258,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
myProgressIndicator.checkCanceled();
check();
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
@@ -1300,7 +1329,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
myProgressIndicator.checkCanceled();
check();
if (files.size() > 0) {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@@ -1339,7 +1368,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
myProgressIndicator.checkCanceled();
check();
if (symbols.size() > 0) {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@@ -1378,7 +1407,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
Object[] objects = myClassModel.getElementsByName(matchResult.elementName, includeLibs, pattern);
for (Object object : objects) {
myProgressIndicator.checkCanceled();
check();
if (!myListModel.contains(object)) {
if (object instanceof PsiElement) {
VirtualFile file = PsiUtilCore.getVirtualFile((PsiElement)object);
@@ -1399,7 +1428,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
myProgressIndicator.checkCanceled();
check();
if (classes.size() > 0) {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@@ -1474,6 +1503,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
final AnAction action = ActionManager.getInstance().getAction(history.fqn);
if (action != null) {
elements.add(action);
myAlreadyAddedActions.add(action);
}
break;
}
@@ -1483,6 +1513,9 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public void consume(Object o) {
if (isSetting(o) || isVirtualFile(o) || isActionValue(o) || o instanceof PsiElement) {
if (o instanceof AnAction && myAlreadyAddedActions.contains(o)) {
return;
}
elements.add(o);
}
}
@@ -1495,7 +1528,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
for (SearchTopHitProvider provider : SearchTopHitProvider.EP_NAME.getExtensions()) {
myProgressIndicator.checkCanceled();
check();
provider.consumeTopHits(pattern, consumer);
}
if (elements.size() > 0) {
@@ -1543,11 +1576,10 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@SuppressWarnings("SSBasedInspection")
private void updatePopup() {
myProgressIndicator.checkCanceled();
check();
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
myProgressIndicator.checkCanceled();
myListModel.update();
myList.revalidate();
myList.repaint();
@@ -1596,6 +1628,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myCalcThread = null;
myPopup = null;
myHistoryIndex = 0;
myCurrentWorker = ActionCallback.DONE;
showAll.set(false);
myNonProjectCheckBox.setSelected(false);
ActionToolbarImpl.updateAllToolbarsImmediately();
@@ -1657,7 +1690,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
MatchResult result;
for (String name : names) {
myProgressIndicator.checkCanceled();
check();
result = null;
if (model instanceof CustomMatcherModel) {
try {
@@ -1687,12 +1720,14 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
return results;
}
public void cancel() {
public ActionCallback cancel() {
myProgressIndicator.cancel();
return myDone;
}
public void start() {
public ActionCallback start() {
ApplicationManager.getApplication().executeOnPooledThread(this);
return myDone;
}
}