MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: fix bad psi tree when replacing parameter

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-03-05 11:46:15 +01:00
parent c7595ad7b4
commit 613871ca43
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java
+10
View File
@@ -284,6 +284,16 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
}
else if (statements.length == 1) {
PsiElement replacement = getMatchExpr(statements[0], elementToReplace);
if (elementToReplace instanceof PsiParameter && replacement instanceof PsiLocalVariable) {
final PsiVariable variable = (PsiVariable)replacement;
final PsiIdentifier identifier = variable.getNameIdentifier();
assert identifier != null;
final String text = variable.getText();
// chop off unneeded semicolons & initializers
final String parameterText = text.substring(0, identifier.getStartOffsetInParent() + identifier.getTextLength());
replacement = JavaPsiFacade.getElementFactory(variable.getProject()).createParameterFromText(parameterText, variable);
}
copyUnmatchedElements(elementToReplace, replacement);
replacement = handleSymbolReplacement(replacement, elementToReplace);