From 951382c61b879522feb21470c4f9327b44c0bca7 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Thu, 28 Jan 2016 17:59:26 +0300 Subject: [PATCH] [go to action] IDEA-148456 Regression: Remote SSH External Tools no longer appearing in Action dialog after upgrade to IntelliJ 15 --- .../gotoByName/GotoActionItemProvider.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java index 5090a0a51c27..5f99add8f480 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,14 +28,11 @@ import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.CollectConsumer; import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; -import gnu.trove.THashSet; -import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,18 +43,8 @@ import static com.intellij.ide.util.gotoByName.GotoActionModel.*; /** * @author peter */ +@SuppressWarnings("TestOnlyProblems") public class GotoActionItemProvider implements ChooseByNameItemProvider { - private static final TObjectHashingStrategy ACTION_OBJECT_HASHING_STRATEGY = new TObjectHashingStrategy() { - @Override - public int computeHashCode(AnAction object) { - return object.getClass().hashCode(); - } - - @Override - public boolean equals(AnAction o1, AnAction o2) { - return Comparing.equal(o1.getClass(), o2.getClass()); - } - }; private final ActionManager myActionManager = ActionManager.getInstance(); protected final SearchableOptionsRegistrar myIndex = SearchableOptionsRegistrar.getInstance(); private final GotoActionModel myModel; @@ -190,7 +177,7 @@ public class GotoActionItemProvider implements ChooseByNameItemProvider { } private boolean processActions(String pattern, boolean everywhere, Processor consumer, DataContext dataContext) { - Set actions = new THashSet(ACTION_OBJECT_HASHING_STRATEGY); + List actions = ContainerUtil.newArrayList(); if (everywhere) { for (String id : ((ActionManagerImpl)myActionManager).getActionIds()) { ProgressManager.checkCanceled(); -- 2.32.0