From 1660fa1f4c93bf4b32e00a9c2f648b2733e463b0 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 10 Oct 2017 01:39:32 +0300 Subject: [PATCH] Replace in Path: don't merge occurrences --- .../lang-impl/src/com/intellij/find/impl/FindPopupPanel.java | 2 +- .../platform-resources-en/src/messages/FindBundle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index b30de3f7e234..01a3acacec5b 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -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); } diff --git a/platform/platform-resources-en/src/messages/FindBundle.properties b/platform/platform-resources-en/src/messages/FindBundle.properties index 79295aa4ea17..28dc2f141865 100644 --- a/platform/platform-resources-en/src/messages/FindBundle.properties +++ b/platform/platform-resources-en/src/messages/FindBundle.properties @@ -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