commit f92f1200c01a84169371a2e893f56956d141a426
author Nate Bosch <nbosch@google.com> Fri Nov 06 12:56:20 2020 -0800
committer Nate Bosch <nbosch@google.com> Fri Nov 06 13:00:24 2020 -0800
tree 2ad9cf7ddda8441aada8cd290c03a82bb9ae4c4f
parent 4dfc20498baab77e2aac3f417514e45a50ad76e4

Non-null map keys

lib/dom.dart

diff --git a/lib/dom.dart b/lib/dom.dart
index f8a992e..de78f26 100644
--- a/lib/dom.dart
+++ b/lib/dom.dart
@@ -167,8 +167,8 @@
   FileSpan? sourceSpan;
 
   /// The attribute spans if requested. Otherwise null.
-  LinkedHashMap<Object?, FileSpan>? _attributeSpans;
-  LinkedHashMap<Object?, FileSpan>? _attributeValueSpans;
+  LinkedHashMap<Object, FileSpan>? _attributeSpans;
+  LinkedHashMap<Object, FileSpan>? _attributeValueSpans;
 
   Node._() {
     nodes._parent = this;
@@ -178,7 +178,7 @@
   /// The span of an attribute is the entire attribute, including the name and
   /// quotes (if any). For example, the span of "attr" in `<a attr="value">`
   /// would be the text `attr="value"`.
-  LinkedHashMap<Object?, FileSpan>? get attributeSpans {
+  LinkedHashMap<Object, FileSpan>? get attributeSpans {
     _ensureAttributeSpans();
     return _attributeSpans;
   }
@@ -187,7 +187,7 @@
   /// value. Unlike [attributeSpans], this span will inlcude only the value.
   /// For example, the value span of "attr" in `<a attr="value">` would be the
   /// text `value`.
-  LinkedHashMap<Object?, FileSpan>? get attributeValueSpans {
+  LinkedHashMap<Object, FileSpan>? get attributeValueSpans {
     _ensureAttributeSpans();
     return _attributeValueSpans;
   }
@@ -278,8 +278,9 @@
   void _ensureAttributeSpans() {
     if (_attributeSpans != null) return;
 
-    _attributeSpans = LinkedHashMap<Object?, FileSpan>();
-    _attributeValueSpans = LinkedHashMap<Object?, FileSpan>();
+    final attributeSpans = _attributeSpans = LinkedHashMap<Object, FileSpan>();
+    final attributeValueSpans =
+        _attributeValueSpans = LinkedHashMap<Object, FileSpan>();
 
     if (sourceSpan == null) return;
 
@@ -293,10 +294,11 @@
 
     for (var attr in token.attributeSpans!) {
       final offset = sourceSpan!.start.offset;
-      _attributeSpans![attr.name] =
+      final name = attr.name!;
+      attributeSpans[name] =
           sourceSpan!.file.span(offset + attr.start, offset + attr.end);
       if (attr.startValue != null) {
-        _attributeValueSpans![attr.name] = sourceSpan!.file
+        attributeValueSpans[name] = sourceSpan!.file
             .span(offset + attr.startValue!, offset + attr.endValue);
       }
     }