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

Unified Diff: pkg/analysis_server/lib/src/services/refactoring/rename_local.dart

Issue 567083002: Issue 20358. Don't report referenced names of named parameters in named expressions as possible sha… (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/rename_local_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
index 906a7006632bbae0bddf0096a2891a33c7b02e42..9e1ab328600c90f61632113ff44b81047af4ec4c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/rename_local.dart
@@ -103,7 +103,7 @@ class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
}
-class _ConflictValidatorVisitor extends RecursiveAstVisitor<Object> {
+class _ConflictValidatorVisitor extends RecursiveAstVisitor {
final RenameLocalRefactoringImpl refactoring;
final RefactoringStatus result;
final SourceRange elementRange;
@@ -111,7 +111,7 @@ class _ConflictValidatorVisitor extends RecursiveAstVisitor<Object> {
_ConflictValidatorVisitor(this.refactoring, this.result, this.elementRange);
@override
- Object visitSimpleIdentifier(SimpleIdentifier node) {
+ visitSimpleIdentifier(SimpleIdentifier node) {
Element nodeElement = node.bestElement;
String newName = refactoring.newName;
if (nodeElement != null && nodeElement.name == newName) {
@@ -120,10 +120,12 @@ class _ConflictValidatorVisitor extends RecursiveAstVisitor<Object> {
String nodeKind = nodeElement.kind.displayName;
String message = "Duplicate ${nodeKind} '$newName'.";
result.addError(message, new Location.fromElement(nodeElement));
- return null;
+ return;
}
// shadowing referenced element
- if (elementRange.contains(node.offset) && !node.isQualified) {
+ if (elementRange.contains(node.offset) &&
+ !node.isQualified &&
+ !_isNamedExpressionName(node)) {
nodeElement = getSyntheticAccessorVariable(nodeElement);
String nodeKind = nodeElement.kind.displayName;
String nodeName = getElementQualifiedName(nodeElement);
@@ -135,6 +137,9 @@ class _ConflictValidatorVisitor extends RecursiveAstVisitor<Object> {
result.addError(message, new Location.fromNode(node));
}
}
- return null;
+ }
+
+ static bool _isNamedExpressionName(SimpleIdentifier node) {
+ return node.parent is Label && node.parent.parent is NamedExpression;
}
}
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/rename_local_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698