diff --git a/platform/platform-impl/src/com/intellij/platform/DefaultPlatformTopHitProvider.java b/platform/platform-impl/src/com/intellij/platform/DefaultPlatformTopHitProvider.java index 394e816ca81e..ab780d30e3f0 100644 --- a/platform/platform-impl/src/com/intellij/platform/DefaultPlatformTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/platform/DefaultPlatformTopHitProvider.java @@ -15,34 +15,23 @@ */ package com.intellij.platform; -import com.intellij.ide.SearchTopHitProvider; -import com.intellij.openapi.actionSystem.ActionManager; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Consumer; +import com.intellij.ide.ActionsTopHitProvider; /** * @author Konstantin Bulenkov */ -public class DefaultPlatformTopHitProvider implements SearchTopHitProvider { +public class DefaultPlatformTopHitProvider extends ActionsTopHitProvider { + private static final String[][] ACTION_MATRIX = { + {"op", "open ", "OpenFile"}, + {"reo", "reopen ", "$LRU"}, + {"new", "new ", "NewGroup"}, + {"new c", "new class ", "NewClass"}, + {"new i", "new interface ", "NewClass"}, + {"new e", "new enum ", "NewClass"}, + }; @Override - public void consumeTopHits(String pattern, Consumer collector) { - //todo[kb] move to constant. Now it's better for hotswap - String[][] ACTION_MATRIX = { - {"op", "open ", "OpenFile"}, - {"reo", "reopen ", "$LRU"}, - {"new", "new ", "NewGroup"}, - {"new c", "new class ", "NewClass"}, - {"new i", "new interface ", "NewClass"}, - {"new e", "new enum ", "NewClass"}, - }; - final ActionManager actionManager = ActionManager.getInstance(); - for (String[] strings : ACTION_MATRIX) { - if (StringUtil.isBetween(pattern, strings[0], strings[1])) { - for (int i = 2; i < strings.length; i++) { - collector.consume(actionManager.getAction(strings[i])); - } - } - } + protected String[][] getActionsMatrix() { + return ACTION_MATRIX; } }