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

Replace in Path: don't merge occurrences

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-10-10 01:41:31 +03:00
parent bb0a37685e
commit 1660fa1f4c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+1 -1
View File
@@ -999,7 +999,7 @@ public class FindPopupPanel extends JBPanel implements FindUI {
UsageInfo2UsageAdapter recentAdapter =
recent instanceof UsageInfo2UsageAdapter ? (UsageInfo2UsageAdapter)recent : null;
UsageInfo2UsageAdapter currentAdapter = usage instanceof UsageInfo2UsageAdapter ? (UsageInfo2UsageAdapter)usage : null;
final boolean merged = currentAdapter != null && recentAdapter != null && recentAdapter.merge(currentAdapter);
final boolean merged = !myHelper.isReplaceState() && currentAdapter != null && recentAdapter != null && recentAdapter.merge(currentAdapter);
if (!merged) {
recentUsageRef.set(usage);
}
platform/platform-resources-en/src/messages/FindBundle.properties
+1 -1
View File
@@ -25,7 +25,7 @@ find.what.usages.of.classes.and.interfaces=Usages of &classes and interfaces
find.dialog.find.button=Find
find.popup.find.button=Open in Find Window
find.popup.replace.all.button=Repl&ace All
find.popup.replace.selected.button=&Replace{0,choice,0#|1#|2# {0} occurrences}
find.popup.replace.selected.button=&Replace{0,choice,0#|1#|2# {0} Occurrences}
find.usages.in.file.dialog.title=Find Usages in File
find.usages.dialog.title=Find Usages
find.open.in.new.tab.checkbox=Open in new ta&b