From 2268107206a9e80eea7e0374641dc712bcbcc030 Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Mon, 10 Jan 2022 13:51:58 -0800 Subject: [PATCH] Fix PackageGraph for analyzer Enum changes. --- lib/src/model/package_graph.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart index 6575d63e52..e19f8dee95 100644 --- a/lib/src/model/package_graph.dart +++ b/lib/src/model/package_graph.dart @@ -798,14 +798,14 @@ class PackageGraph with CommentReferable, Nameable, ModelBuilder { candidates .addAll(allInheritableElements[iKey].where((me) => me.isCanonical)); } - if (e.enclosingElement is ClassElement) { - Class canonicalClass = findCanonicalModelElementFor(e.enclosingElement); - if (canonicalClass != null) { - candidates.addAll(canonicalClass.allCanonicalModelElements.where((m) { - return m.element == e; - })); - } + + var canonicalClass = findCanonicalModelElementFor(e.enclosingElement); + if (canonicalClass is Class) { + candidates.addAll(canonicalClass.allCanonicalModelElements.where((m) { + return m.element == e; + })); } + var matches = {...candidates.where((me) => me.isCanonical)}; // It's possible to find accessors but no combos. Be sure that if we