From 36709d3981126eb2a6760d1b36f451a4ff19d7ab Mon Sep 17 00:00:00 2001
From: "Andrey.Cherkasov" <andrey.cherkasov@jetbrains.com>
Date: Thu, 17 Feb 2022 13:58:43 +0300
Subject: [PATCH] [java-intentions] ReceiverParameterNameFix: change the text
 shown in the quick-fix popup

IDEA-273225
IJ-CR-20529

GitOrigin-RevId: d3cfbb2b3b7c8f33974085c278d158a5c6a0bbba
---
 .../daemon/impl/quickfix/ReceiverParameterNameFix.java         | 3 ++-
 .../quickFix/receiverParameterName/afterConstructor1.java      | 2 +-
 .../quickFix/receiverParameterName/afterConstructor2.java      | 2 +-
 .../quickFix/receiverParameterName/afterInstanceMethod.java    | 2 +-
 .../quickFix/receiverParameterName/beforeConstructor1.java     | 2 +-
 .../quickFix/receiverParameterName/beforeConstructor2.java     | 2 +-
 .../quickFix/receiverParameterName/beforeInstanceMethod.java   | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java
index 607bcb4b9a80..9bc06458c04b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java
@@ -2,6 +2,7 @@
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
+import com.intellij.codeInspection.CommonQuickFixBundle;
 import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -23,7 +24,7 @@ public class ReceiverParameterNameFix extends LocalQuickFixAndIntentionActionOnP
   @Override
   @NotNull
   public String getText() {
-    return QuickFixBundle.message("fix.receiver.parameter.name.text", myNewName);
+    return CommonQuickFixBundle.message("fix.replace.with.x", myNewName);
   }
 
   @NotNull
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor1.java
index 392c39f8efed..84f37526f8e7 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor1.java
@@ -1,4 +1,4 @@
-// "Change to 'A.this'" "true"
+// "Replace with 'A.this'" "true"
 class A {
   class B {
     B(A A.this) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor2.java
index 392c39f8efed..84f37526f8e7 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterConstructor2.java
@@ -1,4 +1,4 @@
-// "Change to 'A.this'" "true"
+// "Replace with 'A.this'" "true"
 class A {
   class B {
     B(A A.this) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterInstanceMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterInstanceMethod.java
index 349d96389b39..eecb7ac70151 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterInstanceMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/afterInstanceMethod.java
@@ -1,4 +1,4 @@
-// "Change to 'this'" "true"
+// "Replace with 'this'" "true"
 class A {
   class B {
     void m(B this) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor1.java
index 9abaadc6d3ed..07ff3e8c5ffc 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor1.java
@@ -1,4 +1,4 @@
-// "Change to 'A.this'" "true"
+// "Replace with 'A.this'" "true"
 class A {
   class B {
     B(A this<caret>) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor2.java
index ab3a0df094e0..2a8dcb9968f6 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeConstructor2.java
@@ -1,4 +1,4 @@
-// "Change to 'A.this'" "true"
+// "Replace with 'A.this'" "true"
 class A {
   class B {
     B(A B.this<caret>) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeInstanceMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeInstanceMethod.java
index 39ec073146f8..6d69c3a2fb5f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeInstanceMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/receiverParameterName/beforeInstanceMethod.java
@@ -1,4 +1,4 @@
-// "Change to 'this'" "true"
+// "Replace with 'this'" "true"
 class A {
   class B {
     void m(B A.this<caret>) {}