From 9f3feb66e0e51ffc9bf335b7e29d50e03cd8d142 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 27 Aug 2024 20:58:11 -0700
Subject: [PATCH 1/2] Simplify hasGetterOrSetter

---
 .../templates.aot_renderers_for_html.dart     | 59 +++++++++++--------
 .../templates.runtime_renderers.dart          |  8 ---
 lib/src/model/getter_setter_combo.dart        |  2 -
 lib/templates/property.html                   |  8 ++-
 lib/templates/top_level_property.html         | 34 +++++------
 5 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
index 17156a9efe..7b8a11df74 100644
--- a/lib/src/generator/templates.aot_renderers_for_html.dart
+++ b/lib/src/generator/templates.aot_renderers_for_html.dart
@@ -1574,7 +1574,8 @@ String renderProperty(PropertyTemplateData context0) {
   buffer.write('''</h1></div>''');
   buffer.writeln();
   var context2 = context0.self;
-  if (context2.hasNoGetterSetter) {
+  buffer.write('\n    ');
+  if (!context2.hasGetterOrSetter) {
     buffer.writeln();
     buffer.write('''
       <section class="multi-line-signature">
@@ -1594,7 +1595,7 @@ String renderProperty(PropertyTemplateData context0) {
     buffer.write('\n      ');
     buffer.write(_renderProperty_partial_source_code_7(context2));
   }
-  buffer.writeln();
+  buffer.write('\n\n    ');
   if (context2.hasGetterOrSetter) {
     if (context2.hasGetter) {
       buffer.write('\n        ');
@@ -2112,7 +2113,7 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) {
   buffer.write(_renderTopLevelProperty_partial_categorization_3(context1));
   buffer.write('''</h1></div>
 ''');
-  if (context1.hasNoGetterSetter) {
+  if (!context1.hasGetterOrSetter) {
     buffer.writeln();
     buffer.write('''
         <section class="multi-line-signature">
@@ -2131,31 +2132,36 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) {
     buffer.write(_renderTopLevelProperty_partial_documentation_7(context1));
     buffer.write('\n        ');
     buffer.write(_renderTopLevelProperty_partial_source_code_8(context1));
-  }
-  buffer.writeln();
-  if (context1.hasExplicitGetter) {
-    buffer.write('\n        ');
-    buffer.write(_renderTopLevelProperty_partial_accessor_getter_9(context1));
-  }
-  buffer.writeln();
-  if (context1.hasExplicitSetter) {
-    buffer.write('\n        ');
-    buffer.write(_renderTopLevelProperty_partial_accessor_setter_10(context1));
-  }
-  buffer.writeln();
-  buffer.write('''
+    if (!context1.hasGetterOrSetter) {
+      buffer.writeln();
+      if (context1.hasExplicitGetter) {
+        buffer.write('\n        ');
+        buffer
+            .write(_renderTopLevelProperty_partial_accessor_getter_9(context1));
+      }
+      buffer.writeln();
+      if (context1.hasExplicitSetter) {
+        buffer.write('\n        ');
+        buffer.write(
+            _renderTopLevelProperty_partial_accessor_setter_10(context1));
+      }
+      buffer.writeln();
+      buffer.write('''
+    {{ /self }}''');
+      buffer.writeln();
+      buffer.write('''
   </div> <!-- /.main-content -->
 
   <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
     ''');
-  buffer.write(_renderTopLevelProperty_partial_search_sidebar_11(context0));
-  buffer.writeln();
-  buffer.write('''
+      buffer.write(_renderTopLevelProperty_partial_search_sidebar_11(context0));
+      buffer.writeln();
+      buffer.write('''
     <h5>''');
-  buffer.writeEscaped(context0.parent!.name);
-  buffer.write(' ');
-  buffer.writeEscaped(context0.parent!.kind.toString());
-  buffer.write('''</h5>
+      buffer.writeEscaped(context0.parent!.name);
+      buffer.write(' ');
+      buffer.writeEscaped(context0.parent!.kind.toString());
+      buffer.write('''</h5>
     <div id="dartdoc-sidebar-left-content"></div>
   </div><!--/.sidebar-offcanvas-left-->
 
@@ -2163,7 +2169,12 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) {
   </div><!--/.sidebar-offcanvas-->
 
 ''');
-  buffer.write(_renderTopLevelProperty_partial_footer_12(context0));
+      buffer.write(_renderTopLevelProperty_partial_footer_12(context0));
+      buffer.writeln();
+    }
+    buffer.writeln();
+  }
+  buffer.writeln();
   buffer.writeln();
 
   return buffer.toString();
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
index f98d72d0c7..ee6f309e2c 100644
--- a/lib/src/generator/templates.runtime_renderers.dart
+++ b/lib/src/generator/templates.runtime_renderers.dart
@@ -6484,13 +6484,6 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
                       self.renderSimpleVariable(c, remainingNames, 'bool'),
                   getBool: (CT_ c) => c.hasGetterOrSetter,
                 ),
-                'hasNoGetterSetter': Property(
-                  getValue: (CT_ c) => c.hasNoGetterSetter,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'bool'),
-                  getBool: (CT_ c) => c.hasNoGetterSetter,
-                ),
                 'hasParameters': Property(
                   getValue: (CT_ c) => c.hasParameters,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -16010,7 +16003,6 @@ const _invisibleGetters = {
     'hasExplicitSetter',
     'hasGetter',
     'hasGetterOrSetter',
-    'hasNoGetterSetter',
     'hasParameters',
     'hasPublicGetter',
     'hasPublicGetterNoSetter',
diff --git a/lib/src/model/getter_setter_combo.dart b/lib/src/model/getter_setter_combo.dart
index fe1cf93799..697b9097fa 100644
--- a/lib/src/model/getter_setter_combo.dart
+++ b/lib/src/model/getter_setter_combo.dart
@@ -259,8 +259,6 @@ mixin GetterSetterCombo on ModelElement {
 
   bool get hasGetter => getter != null;
 
-  bool get hasNoGetterSetter => !hasGetterOrSetter;
-
   bool get hasGetterOrSetter => hasExplicitGetter || hasExplicitSetter;
 
   bool get hasSetter => setter != null;
diff --git a/lib/templates/property.html b/lib/templates/property.html
index 1c3e735bd2..9f9a6c41bb 100644
--- a/lib/templates/property.html
+++ b/lib/templates/property.html
@@ -10,7 +10,9 @@
   {{ /self }}
 
   {{ #self }}
-    {{ #hasNoGetterSetter }}
+    {{!-- If the property has neither an explicit getter nor an explicit setter,
+          display the "shared" documentation for the combined property. --}}
+    {{ ^hasGetterOrSetter }}
       <section class="multi-line-signature">
         {{ >annotations }}
         {{{ modelType.linkedName }}}
@@ -19,8 +21,10 @@
       </section>
       {{ >documentation }}
       {{ >source_code }}
-    {{ /hasNoGetterSetter }}
+    {{ /hasGetterOrSetter }}
 
+    {{!-- Otherwise, the property has an explicit getter or an explicit setter,
+      or both; display separate docs. --}}
     {{ #hasGetterOrSetter }}
       {{ #hasGetter }}
         {{ >accessor_getter }}
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index 1f48f49dba..3dc10586d9 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -1,41 +1,41 @@
-{{>head}}
+{{ >head }}
 
   <div
       id="dartdoc-main-content"
       class="main-content"
       data-above-sidebar="{{ aboveSidebarPath }}"
       data-below-sidebar="{{ belowSidebarPath }}">
-    {{#self}}
-      <div>{{>source_link}}<h1><span class="kind-top-level-property">{{{name}}}</span> {{kind}} {{>feature_set}} {{>categorization}}</h1></div>
+    {{ #self }}
+      <div>{{ >source_link }}<h1><span class="kind-top-level-property">{{{ name }}}</span> {{ kind }} {{ >feature_set }} {{ >categorization }}</h1></div>
 
-      {{#hasNoGetterSetter}}
+      {{ ^hasGetterOrSetter }}
         <section class="multi-line-signature">
           {{ >annotations }}
           {{{ modelType.linkedName }}}
           {{ >name_summary }}
           {{ >attributes }}
         </section>
-        {{>documentation}}
-        {{>source_code}}
-      {{/hasNoGetterSetter}}
+        {{ >documentation }}
+        {{ >source_code }}
+      {{ ^hasGetterOrSetter }}
 
-      {{#hasExplicitGetter}}
-        {{>accessor_getter}}
-      {{/hasExplicitGetter}}
+      {{ #hasExplicitGetter }}
+        {{ >accessor_getter }}
+      {{ /hasExplicitGetter }}
 
-      {{#hasExplicitSetter}}
-        {{>accessor_setter}}
-      {{/hasExplicitSetter}}
-    {{/self}}
+      {{ #hasExplicitSetter }}
+        {{ >accessor_setter }}
+      {{ /hasExplicitSetter }}
+    {{ /self }}
   </div> <!-- /.main-content -->
 
   <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
-    {{>search_sidebar}}
-    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{ >search_sidebar }}
+    <h5>{{ parent.name }} {{ parent.kind }}</h5>
     <div id="dartdoc-sidebar-left-content"></div>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div id="dartdoc-sidebar-right" class="sidebar sidebar-offcanvas-right">
   </div><!--/.sidebar-offcanvas-->
 
-{{>footer}}
+{{ >footer }}

From 43c9bfca0de2ce81024fd324bbc85f0f3bd14b78 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 27 Aug 2024 21:03:25 -0700
Subject: [PATCH 2/2] whoops

---
 .../templates.aot_renderers_for_html.dart     | 52 ++++++++-----------
 lib/templates/top_level_property.html         |  2 +-
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
index 7b8a11df74..96b8b46783 100644
--- a/lib/src/generator/templates.aot_renderers_for_html.dart
+++ b/lib/src/generator/templates.aot_renderers_for_html.dart
@@ -2132,36 +2132,31 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) {
     buffer.write(_renderTopLevelProperty_partial_documentation_7(context1));
     buffer.write('\n        ');
     buffer.write(_renderTopLevelProperty_partial_source_code_8(context1));
-    if (!context1.hasGetterOrSetter) {
-      buffer.writeln();
-      if (context1.hasExplicitGetter) {
-        buffer.write('\n        ');
-        buffer
-            .write(_renderTopLevelProperty_partial_accessor_getter_9(context1));
-      }
-      buffer.writeln();
-      if (context1.hasExplicitSetter) {
-        buffer.write('\n        ');
-        buffer.write(
-            _renderTopLevelProperty_partial_accessor_setter_10(context1));
-      }
-      buffer.writeln();
-      buffer.write('''
-    {{ /self }}''');
-      buffer.writeln();
-      buffer.write('''
+  }
+  buffer.writeln();
+  if (context1.hasExplicitGetter) {
+    buffer.write('\n        ');
+    buffer.write(_renderTopLevelProperty_partial_accessor_getter_9(context1));
+  }
+  buffer.writeln();
+  if (context1.hasExplicitSetter) {
+    buffer.write('\n        ');
+    buffer.write(_renderTopLevelProperty_partial_accessor_setter_10(context1));
+  }
+  buffer.writeln();
+  buffer.write('''
   </div> <!-- /.main-content -->
 
   <div id="dartdoc-sidebar-left" class="sidebar sidebar-offcanvas-left">
     ''');
-      buffer.write(_renderTopLevelProperty_partial_search_sidebar_11(context0));
-      buffer.writeln();
-      buffer.write('''
+  buffer.write(_renderTopLevelProperty_partial_search_sidebar_11(context0));
+  buffer.writeln();
+  buffer.write('''
     <h5>''');
-      buffer.writeEscaped(context0.parent!.name);
-      buffer.write(' ');
-      buffer.writeEscaped(context0.parent!.kind.toString());
-      buffer.write('''</h5>
+  buffer.writeEscaped(context0.parent!.name);
+  buffer.write(' ');
+  buffer.writeEscaped(context0.parent!.kind.toString());
+  buffer.write('''</h5>
     <div id="dartdoc-sidebar-left-content"></div>
   </div><!--/.sidebar-offcanvas-left-->
 
@@ -2169,12 +2164,7 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) {
   </div><!--/.sidebar-offcanvas-->
 
 ''');
-      buffer.write(_renderTopLevelProperty_partial_footer_12(context0));
-      buffer.writeln();
-    }
-    buffer.writeln();
-  }
-  buffer.writeln();
+  buffer.write(_renderTopLevelProperty_partial_footer_12(context0));
   buffer.writeln();
 
   return buffer.toString();
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index 3dc10586d9..826fcddaec 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -17,7 +17,7 @@
         </section>
         {{ >documentation }}
         {{ >source_code }}
-      {{ ^hasGetterOrSetter }}
+      {{ /hasGetterOrSetter }}
 
       {{ #hasExplicitGetter }}
         {{ >accessor_getter }}