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/analyzer/lib/src/generated/declaration_resolver.dart

Issue 2436733004: Fix DeclarationResolver handling of annotations containing closures. (Closed)
Patch Set: Created 4 years, 2 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/analyzer/test/src/context/context_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/declaration_resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/declaration_resolver.dart b/pkg/analyzer/lib/src/generated/declaration_resolver.dart
index d67bc4c02fed6bfa911fa18ea90dd0b41c59bd12..4b16bfca969d98d4aa511248f9975fd55e481494 100644
--- a/pkg/analyzer/lib/src/generated/declaration_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/declaration_resolver.dart
@@ -9,7 +9,9 @@ import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/exception/exception.dart';
+import 'package:analyzer/src/dart/element/builder.dart';
import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/generated/resolver.dart';
/**
* A visitor that resolves declarations in an AST structure to already built
@@ -51,6 +53,17 @@ class DeclarationResolver extends RecursiveAstVisitor<Object> {
}
@override
+ Object visitAnnotation(Annotation node) {
+ // Annotations can only contain elements in certain erroneous situations,
+ // in which case the elements are disconnected from the rest of the element
+ // model, thus we can't reconnect to them. To avoid crashes, just create
+ // fresh elements.
+ ElementHolder elementHolder = new ElementHolder();
+ new ElementBuilder(elementHolder, _enclosingUnit).visitAnnotation(node);
+ return null;
+ }
+
+ @override
Object visitCatchClause(CatchClause node) {
SimpleIdentifier exceptionParameter = node.exceptionParameter;
if (exceptionParameter != null) {
« no previous file with comments | « no previous file | pkg/analyzer/test/src/context/context_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698