Hide branches in functions list

Author: sdarwin

gcovr-templates/html/functions_page.content.html

@@ -1,11 +1,14 @@
 {# -*- engine: jinja -*- #}
-<div class="functions-container">
+<div class="functions-container{% if not (info.branches.total > info.branches.excluded) %} no-branches{% endif %}">
   <div class="functions-body">
     <div class="functions-header">
       {% set class_sortable = " sortable" if not info.static_report and function_list | length > 1 else "" %}
       <div class="col-function{{class_sortable}}{% if class_sortable %} sorted-ascending{% endif %}" data-sort="name">Function</div>
       <div class="col-calls{{class_sortable}}" data-sort="calls">Calls</div>
       <div class="col-lines{{class_sortable}}" data-sort="lines">Lines</div>
+      {% if info.branches.total > info.branches.excluded %}
+      <div class="col-branches{{class_sortable}}" data-sort="branches">Branches</div>
+      {% endif %}
       {% if SHOW_CONDITION_COVERAGE %}
       <div class="col-conditions{{class_sortable}}" data-sort="conditions">Conditions</div>
       {% endif %}
@@ -39,6 +42,7 @@
   window.__functionsPageConfig = {
     singlePage: {{ "true" if info.single_page else "false" }},
     htmlFilename: "{{ html_filename }}",
+    showBranches: {{ "true" if info.branches.total > info.branches.excluded else "false" }},
     showConditions: {{ "true" if SHOW_CONDITION_COVERAGE else "false" }}
   };
 </script>

gcovr-templates/html/functions_page.summary.html

@@ -9,8 +9,10 @@
     <span class="stat-label">Lines:</span>
     <span class="stat-value {{info.lines.class}}">{{info.lines.coverage}}%</span>
   </div>
+  {% if info.branches.coverage != '-' %}
   <div class="summary-stat">
     <span class="stat-label">Branches:</span>
     <span class="stat-value {{info.branches.class}}">{{info.branches.coverage}}%</span>
   </div>
+  {% endif %}
 </div>

gcovr-templates/html/gcovr.js

@@ -943,6 +943,7 @@
     var data = JSON.parse(dataEl.textContent);
     var container = document.querySelector('.functions-body');
     var loadingEl = document.getElementById('functions-loading');
+    var showBranches = config.showBranches;
     var showConditions = config.showConditions;
     var singlePage = config.singlePage;
     var currentFile = config.htmlFilename || '';
@@ -1013,6 +1014,11 @@
       // col-lines
       row.appendChild(el('div', 'col-lines', entry.line_coverage + '%'));
 
+      // col-branches (optional)
+      if (showBranches) {
+        row.appendChild(el('div', 'col-branches', entry.branch_coverage + '%'));
+      }
+
       // col-conditions (optional)
       if (showConditions) {
         row.appendChild(el('div', 'col-conditions', entry.condition_coverage + '%'));
@@ -1085,6 +1091,7 @@
           case 'name': aVal = a.name; bVal = b.name; break;
           case 'calls': aVal = a.excluded ? -1 : a.execution_count; bVal = b.excluded ? -1 : b.execution_count; break;
           case 'lines': aVal = parseFloat(a.line_coverage) || 0; bVal = parseFloat(b.line_coverage) || 0; break;
+          case 'branches': aVal = parseFloat(a.branch_coverage) || 0; bVal = parseFloat(b.branch_coverage) || 0; break;
           case 'conditions': aVal = parseFloat(a.condition_coverage) || 0; bVal = parseFloat(b.condition_coverage) || 0; break;
           default: aVal = a.name; bVal = b.name;
         }
@@ -2043,8 +2050,12 @@
     } catch (e) {}
 
     // Apply saved hidden columns
+    var fnList = document.querySelector('.source-functions-list');
     for (var i = 0; i < hidden.length; i++) {
       table.classList.add('hide-col-' + hidden[i]);
+      if (fnList) {
+        fnList.classList.add('hide-col-' + hidden[i]);
+      }
     }
 
     // Update button appearance to match state
@@ -2063,6 +2074,12 @@
         var isHidden = table.classList.toggle(hideClass);
         this.classList.toggle('show-col', !isHidden);
 
+        // Sync with function list sidebar
+        var fnList = document.querySelector('.source-functions-list');
+        if (fnList) {
+          fnList.classList.toggle(hideClass, isHidden);
+        }
+
         // Save state
         var current = [];
         var allBtns = document.querySelectorAll('.col-toggle');

gcovr-templates/html/source_page.content.html

@@ -90,7 +90,9 @@
         <span class="source-function-col-name{{ sortable }}{% if sortable %} sorted-ascending{% endif %}" data-sort="name">Function</span>
         <span class="source-function-col-stat{{ sortable }}" data-sort="calls">Calls</span>
         <span class="source-function-col-stat{{ sortable }}" data-sort="lines">Lines</span>
-        <span class="source-function-col-stat{{ sortable }}" data-sort="branches">Branches</span>
+        {% if has_branches %}
+        <span class="source-function-col-stat col-branches{{ sortable }}" data-sort="branches">Branches</span>
+        {% endif %}
         <span class="source-function-col-stat{{ sortable }}" data-sort="blocks">Blocks</span>
       </div>
       {% for entry in function_list | sort(attribute='line') %}
@@ -108,9 +110,11 @@
         <span class="source-function-col-stat{% if entry.excluded %} excluded{% elif entry.line_coverage is defined and entry.line_coverage == 100.0 %} cov-high{% elif entry.line_coverage is defined and entry.line_coverage > 0 %} cov-med{% else %} cov-low{% endif %}">
           {%- if entry.excluded %}&ndash;{% elif entry.line_coverage is defined %}{{ entry.line_coverage | round(1) }}%{% else %}&ndash;{% endif -%}
         </span>
-        <span class="source-function-col-stat{% if entry.excluded %} excluded{% elif entry.branch_coverage is defined and entry.branch_coverage != '-' %}{% if entry.branch_coverage == 100.0 %} cov-high{% elif entry.branch_coverage > 0 %} cov-med{% else %} cov-low{% endif %}{% endif %}">
+        {% if has_branches %}
+        <span class="source-function-col-stat col-branches{% if entry.excluded %} excluded{% elif entry.branch_coverage is defined and entry.branch_coverage != '-' %}{% if entry.branch_coverage == 100.0 %} cov-high{% elif entry.branch_coverage > 0 %} cov-med{% else %} cov-low{% endif %}{% endif %}">
           {%- if entry.excluded %}&ndash;{% elif entry.branch_coverage is defined and entry.branch_coverage != '-' %}{{ entry.branch_coverage | round(1) }}%{% else %}&ndash;{% endif -%}
         </span>
+        {% endif %}
         <span class="source-function-col-stat{% if entry.excluded %} excluded{% elif blks is not none %}{% if blks == 100.0 %} cov-high{% elif blks > 0 %} cov-med{% else %} cov-low{% endif %}{% endif %}">
           {%- if entry.excluded %}&ndash;{% elif blks is not none %}{{ blks | round(1) }}%{% else %}&ndash;{% endif -%}
         </span>

gcovr-templates/html/style.css

@@ -1658,6 +1658,10 @@ tr.source-line.nav-highlight > td {
   overflow-y: auto;
 }
 
+.source-functions-list.hide-col-branch .col-branches {
+  display: none;
+}
+
 .source-function-header {
   display: flex;
   align-items: center;
@@ -2247,7 +2251,7 @@ tr.source-line.nav-highlight > td {
 
 .functions-header {
   display: grid;
-  grid-template-columns: 1fr 90px 70px{% if SHOW_CALLS %} 90px{% endif %};
+  grid-template-columns: 1fr 90px 70px 90px{% if SHOW_CALLS %} 90px{% endif %};
   gap: 0;
   padding: 0 16px;
   background: var(--bg-tertiary);
@@ -2291,14 +2295,19 @@ tr.source-line.nav-highlight > td {
 
 .function-row {
   display: grid;
-  grid-template-columns: 1fr 90px 70px{% if SHOW_CALLS %} 90px{% endif %};
+  grid-template-columns: 1fr 90px 70px 90px{% if SHOW_CALLS %} 90px{% endif %};
   gap: 0;
   padding: 0 16px;
   border-bottom: 1px solid var(--border-muted);
   align-items: stretch;
   transition: background var(--transition-fast);
 }
 
+.functions-container.no-branches .functions-header,
+.functions-container.no-branches .function-row {
+  grid-template-columns: 1fr 90px 70px{% if SHOW_CALLS %} 90px{% endif %};
+}
+
 .function-row > div:not(:first-child) {
   display: flex;
   align-items: center;