dart-lang
diff --git a/‎pkg/analyzer/lib/src/dart/analysis/driver.dart‎
Lines changed: 1 addition & 1 deletion b/‎pkg/analyzer/lib/src/dart/analysis/driver.dart‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/analyzer/lib/src/dart/element/element.dart‎
Lines changed: 18 additions & 13 deletions b/‎pkg/analyzer/lib/src/dart/element/element.dart‎
Lines changed: 18 additions & 13 deletions
@@ -95,7 +95,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
   /**
    * The version of data format, should be incremented on every format change.
    */
-  static const int DATA_VERSION = 86;
+  static const int DATA_VERSION = 87;
 
   /**
    * The number of exception contexts allowed to write. Once this field is
 
@@ -1782,19 +1782,16 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
       var containerRef = reference.getChild('@extension');
       _extensions = <ExtensionElement>[];
       for (var node in linkedNode.declarations) {
-        String name;
         if (node is ExtensionDeclaration) {
-          name = node.name.name;
-        } else {
-          continue;
-        }
-        var reference = containerRef.getChild(name);
-        if (reference.hasElementFor(node)) {
-          _extensions.add(reference.element);
-        } else {
-          _extensions.add(
-            ExtensionElementImpl.forLinkedNode(this, reference, node),
-          );
+          var refName = linkedContext.getExtensionRefName(node);
+          var reference = containerRef.getChild(refName);
+          if (reference.hasElementFor(node)) {
+            _extensions.add(reference.element);
+          } else {
+            _extensions.add(
+              ExtensionElementImpl.forLinkedNode(this, reference, node),
+            );
+          }
         }
       }
       return _extensions;
@@ -5085,6 +5082,14 @@ class ExtensionElementImpl extends ElementImpl
     _fields = fields;
   }
 
+  @override
+  String get identifier {
+    if (linkedNode != null) {
+      return reference.name;
+    }
+    return super.identifier;
+  }
+
   @override
   bool get isSimplyBounded => true;
 
@@ -5155,7 +5160,7 @@ class ExtensionElementImpl extends ElementImpl
   @override
   String get name {
     if (linkedNode != null) {
-      return reference.name;
+      return (linkedNode as ExtensionDeclaration).name?.name ?? '';
     }
     if (_unlinkedExtension != null) {
       return _unlinkedExtension.name;