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

inplace rename: preserve text range

Browse Source
This commit is contained in:
anna
2011-06-20 14:24:39 +04:00
parent 74db8d94e8
commit edd226758d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+11 -7
View File
@@ -235,7 +235,7 @@ public class VariableInplaceRenamer {
addVariable(ref, selectedElement, builder, offset, nameSuggestions);
}
for (Pair<PsiElement, TextRange> usage : stringUsages) {
addVariable(usage.first, selectedElement, builder, nameSuggestions);
addVariable(usage.first, usage.second, selectedElement, builder, nameSuggestions);
}
addAdditionalVariables(builder);
@@ -534,21 +534,25 @@ public class VariableInplaceRenamer {
final PsiElement selectedElement,
final TemplateBuilderImpl builder,
final LinkedHashSet<String> names) {
addVariable(element, null, selectedElement, builder, names);
}
private void addVariable(final PsiElement element,
@Nullable final TextRange textRange,
final PsiElement selectedElement,
final TemplateBuilderImpl builder,
final LinkedHashSet<String> names) {
if (element == selectedElement) {
Expression expression = new MyExpression(myElementToRename.getName(), names);
builder.replaceElement(element, PRIMARY_VARIABLE_NAME, expression, true);
} else if (textRange != null) {
builder.replaceElement(element, textRange, OTHER_VARIABLE_NAME, PRIMARY_VARIABLE_NAME, false);
}
else {
builder.replaceElement(element, OTHER_VARIABLE_NAME, PRIMARY_VARIABLE_NAME, false);
}
}
private static void addVariable(PsiElement element,
TextRange textRange,
TemplateBuilderImpl builder) {
builder.replaceElement(element, textRange, OTHER_VARIABLE_NAME, PRIMARY_VARIABLE_NAME, false);
}
protected LookupElement[] createLookupItems(final LookupElement[] lookupItems, final String name) {
return lookupItems;
}