From 40d25dbdc3fbed496553ffa7dbb5e4a1b457e1fd Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Sat, 16 Aug 2025 16:50:08 +0200 Subject: [PATCH] Java: fix typo in conflict message GitOrigin-RevId: f8840f44131b57eee969db7c50dae5860f0dcf30 --- .../inline/InlineParameterExpressionProcessor.java | 10 ++-------- .../java/refactoring/inline/InlineParameterTest.java | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java index d59ba2c5ca1d..76606b7e375f 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java @@ -365,18 +365,12 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor public void visitThisExpression(@NotNull PsiThisExpression thisExpression) { super.visitThisExpression(thisExpression); final PsiJavaCodeReferenceElement qualifier = thisExpression.getQualifier(); - PsiElement containingClass; - if (qualifier != null) { - containingClass = qualifier.resolve(); - } - else { - containingClass = PsiTreeUtil.getParentOfType(myMethodCall, PsiClass.class); - } + PsiElement containingClass = (qualifier != null) ? qualifier.resolve() : PsiTreeUtil.getParentOfType(myMethodCall, PsiClass.class); final PsiClass methodContainingClass = myMethod.getContainingClass(); LOG.assertTrue(methodContainingClass != null); if (!PsiTreeUtil.isAncestor(containingClass, methodContainingClass, false) || myMethod.hasModifierProperty(PsiModifier.STATIC)) { myConflicts.putValue(thisExpression, JavaRefactoringBundle.message("inline.parameter.dependency.unavailable.in.parameter.method", - "this")); + "this")); } } diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java index fa72d123fa2c..47650f0cb700 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java @@ -88,7 +88,7 @@ public class InlineParameterTest extends LightRefactoringTestCase { doTest(false); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - assertEquals("Parameter initializer depends on this which is not accessible inside the parameter's method", e.getMessage()); + assertEquals("Parameter initializer depends on this which is not accessible inside the parameter's method", e.getMessage()); } } @@ -263,7 +263,7 @@ public class InlineParameterTest extends LightRefactoringTestCase { doTest(false); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - assertEquals("Parameter initializer depends on this which is not accessible inside the parameter's method", e.getMessage()); + assertEquals("Parameter initializer depends on this which is not accessible inside the parameter's method", e.getMessage()); } }