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

Java: fix typo in conflict message

Browse Source 
GitOrigin-RevId: f8840f44131b57eee969db7c50dae5860f0dcf30
This commit is contained in:
Bas Leijdekkers
2025-08-19 09:09:25 +00:00
committed by intellij-monorepo-bot
parent 09395ad271
commit 40d25dbdc3
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
+2 -8
View File
@@ -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",
"<b><code>this<code></b>"));
"<b><code>this</code></b>"));
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/inline/InlineParameterTest.java
+2 -2
View File
@@ -88,7 +88,7 @@ public class InlineParameterTest extends LightRefactoringTestCase {
doTest(false);
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals("Parameter initializer depends on <b><code>this<code></b> which is not accessible inside the parameter's method", e.getMessage());
assertEquals("Parameter initializer depends on <b><code>this</code></b> 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 <b><code>this<code></b> which is not accessible inside the parameter's method", e.getMessage());
assertEquals("Parameter initializer depends on <b><code>this</code></b> which is not accessible inside the parameter's method", e.getMessage());
}
}