Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java

Issue 9921015: Visit name of DartDeclaration, set Element for DartIdentifier (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Visit more name-like nodes, tweaks for review Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java
index b754282ad03e86b92e2e5262e3e03c3e4c74f7f3..6dac5466c564aadb0ed7f1be8a83d17a5267fc6d 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/corext/refactoring/rename/RenameLocalVariableProcessor.java
@@ -238,8 +238,7 @@ public class RenameLocalVariableProcessor extends DartRenameProcessor {
}
private void createEdits() {
- TextEdit declarationEdit = createRenameEdit(fVariableElement.getSourceInfo().getOffset());
- List<TextEdit> allRenameEdits = getAllRenameEdits(declarationEdit);
+ List<TextEdit> allRenameEdits = getAllRenameEdits();
// TextEdit[] allUnparentedRenameEdits = new TextEdit[allRenameEdits.length];
// TextEdit unparentedDeclarationEdit = null;
@@ -265,7 +264,8 @@ public class RenameLocalVariableProcessor extends DartRenameProcessor {
// }
rootEdit.addChild(edit);
fChange.addTextEditGroup(new TextEditGroup(
- RefactoringCoreMessages.RenameTempRefactoring_changeName, edit));
+ RefactoringCoreMessages.RenameTempRefactoring_changeName,
+ edit));
}
// store information for analysis
@@ -274,8 +274,7 @@ public class RenameLocalVariableProcessor extends DartRenameProcessor {
// allUnparentedRenameEdits);
// } else
{
- fLocalAnalyzePackage = new RenameAnalyzeUtil.LocalAnalyzePackage(declarationEdit,
- allRenameEdits);
+ fLocalAnalyzePackage = new RenameAnalyzeUtil.LocalAnalyzePackage(null, allRenameEdits);
}
}
@@ -283,8 +282,8 @@ public class RenameLocalVariableProcessor extends DartRenameProcessor {
return new ReplaceEdit(offset, fCurrentName.length(), fNewName);
}
- private List<TextEdit> getAllRenameEdits(TextEdit declarationEdit) {
- final List<TextEdit> edits = Lists.newArrayList(declarationEdit);
+ private List<TextEdit> getAllRenameEdits() {
+ final List<TextEdit> edits = Lists.newArrayList();
DartNode enclosingMethod = ASTNodes.getParent(fVariableNode, DartMethodDefinition.class);
enclosingMethod.accept(new ASTVisitor<Void>() {
@Override
@@ -312,16 +311,9 @@ public class RenameLocalVariableProcessor extends DartRenameProcessor {
return;
}
// Prepare variable Element.
- // TODO(scheglov) Fix DartC to set Element for DartIdentifier
- if (fVariableNode.getElement() == null) {
- fVariableNode = fVariableNode.getParent();
- }
if (fVariableNode.getElement() instanceof VariableElement) {
fVariableElement = (VariableElement) fVariableNode.getElement();
}
-// if (variableReferenceNode.getParent() instanceof DartVariable) {
-// fTempDeclarationNode = (DartVariable) variableReferenceNode.getParent();
-// }
}
private void initNames() {
« no previous file with comments | « editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/utilities/ast/DartElementLocatorTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698