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

UX-1 new SearchEverywhere popup

Browse Source 
* enable new SE as internal experimental feature
This commit is contained in:
Mikhail Sokolov
2018-06-04 13:19:28 +03:00
parent 1d91152499
commit acee506ff0
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+2 -1
View File
@@ -15,6 +15,7 @@ import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.actionSystem.impl.ActionMenu;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.editor.Editor;
@@ -54,7 +55,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (Registry.is("new.search.everywhere")) {
if (Registry.is("new.search.everywhere") || Experiments.isFeatureEnabled("new.search.everywhere")) {
showInSearchEverywherePopup(ActionSearchEverywhereContributor.class.getSimpleName(), e);
} else {
super.actionPerformed(e);
platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
+2 -1
View File
@@ -32,6 +32,7 @@ import com.intellij.navigation.AnonymousElementProvider;
import com.intellij.navigation.ChooseByNameRegistry;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -61,7 +62,7 @@ import java.util.List;
public class GotoClassAction extends GotoActionBase implements DumbAware {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (Registry.is("new.search.everywhere")) {
if (Registry.is("new.search.everywhere") || Experiments.isFeatureEnabled("new.search.everywhere")) {
showInSearchEverywherePopup(ClassSearchEverywhereContributor.class.getSimpleName(), e);
return;
}
platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
+2 -1
View File
@@ -25,6 +25,7 @@ import com.intellij.ide.util.gotoByName.GotoFileModel;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
@@ -55,7 +56,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (Registry.is("new.search.everywhere")) {
if (Registry.is("new.search.everywhere") || Experiments.isFeatureEnabled("new.search.everywhere")) {
showInSearchEverywherePopup(FileSearchEverywhereContributor.class.getSimpleName(), e);
} else {
super.actionPerformed(e);
platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.lang.Language;
import com.intellij.navigation.ChooseByNameRegistry;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.psi.PsiDocumentManager;
@@ -31,7 +32,7 @@ public class GotoSymbolAction extends GotoActionBase {
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (Registry.is("new.search.everywhere")) {
if (Registry.is("new.search.everywhere") || Experiments.isFeatureEnabled("new.search.everywhere")) {
showInSearchEverywherePopup(SymbolSearchEverywhereContributor.class.getSimpleName(), e);
} else {
super.actionPerformed(e);
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+2 -1
View File
@@ -46,6 +46,7 @@ import com.intellij.openapi.actionSystem.ex.CustomComponentAction;
import com.intellij.openapi.actionSystem.impl.ActionButton;
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
@@ -563,7 +564,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
public void actionPerformed(AnActionEvent e, MouseEvent me) {
if (Registry.is("new.search.everywhere")) {
if (Registry.is("new.search.everywhere") || Experiments.isFeatureEnabled("new.search.everywhere")) {
//todo[mikhail.sokolov] show new UI
String searchProviderID = SearchEverywhereContributor.ALL_CONTRIBUTORS_GROUP_ID;
platform/platform-resources/src/META-INF/PlatformExtensions.xml
+3
View File
@@ -599,5 +599,8 @@
<experimentalFeature id="inline.browse.button" internalFeature="true" percentOfUsers="0">
<description>Inlines browse button inside TextFieldWithBrowseButton component</description>
</experimentalFeature>
<experimentalFeature id="new.search.everywhere" internalFeature="true" percentOfUsers="100">
<description>Shows new consolidated popup for all GoTo and Search Everywhere actions</description>
</experimentalFeature>
</extensions>
</idea-plugin>