Tidy up Parameter.htmlId (#3723)

dart-lang · Mar 18, 2024 · 67f72d5 · 67f72d5
1 parent d599364
commit 67f72d5
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/lib/src/model/parameter.dart b/lib/src/model/parameter.dart
@@ -38,23 +38,22 @@ class Parameter extends ModelElement with HasNoPage {
   @override
   String get htmlId {
     final enclosingElement = element.enclosingElement;
-    if (enclosingElement != null) {
-      var enclosingName = enclosingElement.name;
-      if (enclosingElement is GenericFunctionTypeElement) {
-        // TODO(jcollins-g): Drop when GenericFunctionTypeElement populates
-        // name. Also, allowing null here is allowed as a workaround for
-        // dart-lang/sdk#32005.
-        for (Element e = enclosingElement;
-            e.enclosingElement != null;
-            e = e.enclosingElement!) {
-          enclosingName = e.name;
-          if (enclosingName != null && enclosingName.isNotEmpty) break;
-        }
-      }
-      return '$enclosingName-param-$name';
-    } else {
+    if (enclosingElement == null) {
       return 'param-$name';
     }
+    var enclosingName = enclosingElement.name;
+    if (enclosingElement is GenericFunctionTypeElement) {
+      // TODO(jcollins-g): Drop when GenericFunctionTypeElement populates
+      // name. Also, allowing null here is allowed as a workaround for
+      // dart-lang/sdk#32005.
+      for (Element e = enclosingElement;
+          e.enclosingElement != null;
+          e = e.enclosingElement!) {
+        enclosingName = e.name;
+        if (enclosingName != null && enclosingName.isNotEmpty) break;
+      }
+    }
+    return '$enclosingName-param-$name';
   }
 
   @override