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

Unified Diff: pkg/analyzer/lib/src/generated/incremental_resolver.dart

Issue 759353002: Fix for incremental resolution of top-level and class-member accessors. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month 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/analyzer/test/generated/incremental_resolver_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/incremental_resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/incremental_resolver.dart b/pkg/analyzer/lib/src/generated/incremental_resolver.dart
index 9dfc405b73649eb42c0c735cdd88344f9fc14d12..fb8c0b663a7a23ffa3b176640d2e0b0a6976e86d 100644
--- a/pkg/analyzer/lib/src/generated/incremental_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/incremental_resolver.dart
@@ -818,14 +818,36 @@ class IncrementalResolver {
}
// apply compatible changes to elements
if (node is FunctionDeclaration) {
- FunctionElementImpl oldElement = node.element;
- FunctionElementImpl newElement = holder.functions[0];
+ ExecutableElementImpl oldElement = node.element;
+ // prepare the new element
+ ExecutableElement newElement;
+ {
+ List<FunctionElement> holderFunctions = holder.functions;
+ List<PropertyAccessorElement> holderAccessors = holder.accessors;
+ if (holderFunctions.isNotEmpty) {
+ newElement = holderFunctions[0];
+ } else if (holderAccessors.isNotEmpty) {
+ newElement = holderAccessors[0];
+ }
+ }
+ // update the old Element
oldElement.labels = newElement.labels;
oldElement.localVariables = newElement.localVariables;
}
if (node is MethodDeclaration) {
- MethodElementImpl oldElement = node.element;
- MethodElementImpl newElement = holder.methods[0];
+ ExecutableElementImpl oldElement = node.element;
+ // prepare the new element
+ ExecutableElement newElement;
+ {
+ List<MethodElement> holderMethods = holder.methods;
+ List<PropertyAccessorElement> holderAccessors = holder.accessors;
+ if (holderMethods.isNotEmpty) {
+ newElement = holderMethods[0];
+ } else if (holderAccessors.isNotEmpty) {
+ newElement = holderAccessors[0];
+ }
+ }
+ // update the old Element
oldElement.labels = newElement.labels;
oldElement.localVariables = newElement.localVariables;
}
@@ -962,6 +984,7 @@ class PoorMansIncrementalResolver {
_newVerifyErrors = incrementalResolver._verifyErrors;
_newHints = incrementalResolver._hints;
_updateEntry();
+ print('Successfully incrementally resolved.');
Brian Wilkerson 2014/11/26 19:41:27 Comment this out?
return true;
}
} catch (e, st) {
« no previous file with comments | « no previous file | pkg/analyzer/test/generated/incremental_resolver_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698