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

goto action doesn't take selection from editor (IDEA-79684)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-01-19 12:41:40 +01:00
parent ccce7145f9
commit fe46fdeba8
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
}, ModalityState.NON_MODAL);
}
}
});
}, null, false);
}
}
platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+5 -4
View File
@@ -119,21 +119,22 @@ public abstract class GotoActionBase extends AnAction {
}
protected static <T> void showNavigationPopup(AnActionEvent e, ChooseByNameModel model, final GotoActionCallback<T> callback) {
showNavigationPopup(e, model, callback, null);
showNavigationPopup(e, model, callback, null, true);
}
protected static <T> void showNavigationPopup(AnActionEvent e,
ChooseByNameModel model,
final GotoActionCallback<T> callback,
final String findTitle) {
@Nullable final String findUsagesTitle,
boolean useSelectionFromEditor) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
boolean mayRequestOpenInCurrentWindow = model.willOpenEditor() && FileEditorManagerEx.getInstanceEx(project).hasSplitOrUndockedWindows();
final Class startedAction = myInAction;
LOG.assertTrue(startedAction != null);
Pair<String, Integer> start = getInitialText(e.getData(PlatformDataKeys.EDITOR));
Pair<String, Integer> start = getInitialText(useSelectionFromEditor ? e.getData(PlatformDataKeys.EDITOR) : null);
final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, model, getPsiContext(e), start.first, mayRequestOpenInCurrentWindow, start.second);
popup.setFindUsagesTitle(findTitle);
popup.setFindUsagesTitle(findUsagesTitle);
final ChooseByNameFilter<T> filter = callback.createFilter(popup);
popup.invoke(new ChooseByNamePopupComponent.Callback() {
platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
token.finish();
}
}
}, "Classes matching pattern");
}, "Classes matching pattern", true);
}
private static PsiElement getElement(PsiElement element, ChooseByNamePopup popup) {
platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware {
}
}, ModalityState.NON_MODAL);
}
}, "Files matching pattern");
}, "Files matching pattern", true);
}
protected static class GotoFileFilter extends ChooseByNameFilter<FileType> {
platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class GotoSymbolAction extends GotoActionBase {
public void elementChosen(ChooseByNamePopup popup, Object element) {
EditSourceUtil.navigate((NavigationItem)element, true, popup.isOpenInCurrentWindowRequested());
}
}, "Symbols matching patterns");
}, "Symbols matching patterns", true);
}
protected boolean hasContributors(DataContext dataContext) {
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+1 -1
View File
@@ -218,7 +218,7 @@ public abstract class ChooseByNameBase {
myToolArea = toolArea;
}
public void setFindUsagesTitle(String findUsagesTitle) {
public void setFindUsagesTitle(@Nullable String findUsagesTitle) {
myFindUsagesTitle = findUsagesTitle;
}