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

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

Issue 770613003: Don't throw an exception when model is changed. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years 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 193403b4f0b97958a5b6ac72a8bac71ce5a22aee..f6d17c00b2a9b837616b5c529ec99c2cc7bbcd31 100644
--- a/pkg/analyzer/lib/src/generated/incremental_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/incremental_resolver.dart
@@ -671,8 +671,10 @@ class IncrementalResolver {
* Resolve [node], reporting any errors or warnings to the given listener.
*
* [node] - the root of the AST structure to be resolved.
+ *
+ * Returns `true` if resolution was successful.
*/
- void resolve(AstNode node) {
+ bool resolve(AstNode node) {
logger.enter('resolve: $_definingUnit');
try {
logger.log(() => 'node: $node');
@@ -684,8 +686,7 @@ class IncrementalResolver {
_updateOffset,
_updateNewLength - _updateOldLength);
if (_elementModelChanged(rootNode)) {
- throw new AnalysisException(
- "Cannot resolve node: element model changed");
+ return false;
}
_updateElements(rootNode);
// resolve
@@ -693,6 +694,8 @@ class IncrementalResolver {
// verify
_verify(rootNode);
_generateHints(rootNode);
+ // OK
+ return true;
} finally {
logger.exit();
}
@@ -1064,7 +1067,13 @@ class PoorMansIncrementalResolver {
_updateOffset,
oldNode.length,
newNode.length);
- incrementalResolver.resolve(newNode);
+ bool success = incrementalResolver.resolve(newNode);
+ // check if success
+ if (!success) {
+ logger.log('Failure: element model changed.');
+ return false;
+ }
+ // update DartEntry
_newResolveErrors = incrementalResolver._resolveErrors;
_newVerifyErrors = incrementalResolver._verifyErrors;
_newHints = incrementalResolver._hints;
« 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