diff: Highlight both diffed versions in the sidebar

Author: fstachura

elixir/web.py

@@ -444,6 +444,8 @@ def get_projects(basedir: str) -> list[ProjectEntry]:
 # Used to render version list in the sidebar
 VersionEntry = namedtuple('VersionEntry', 'version, url, diff_url')
 
+VersionPath = namedtuple('VersionPath', 'major, minor, path')
+
 # Takes result of Query.get_versions() and prepares it for the sidebar template.
 #  Returns an OrderedDict with version information and optionally a triple with
 #  (major, minor, version) of current_version. The triple is useful, because sometimes
@@ -456,10 +458,10 @@ def get_projects(basedir: str) -> list[ProjectEntry]:
 def get_versions(versions: OrderedDict[str, OrderedDict[str, str]],
                  get_url: Callable[[str], str],
                  get_diff_url: Optional[Callable[[str], str]],
-                 current_version: str) -> Tuple[dict[str, dict[str, list[VersionEntry]]], Tuple[str|None, str|None, str|None]]:
+                 current_version: str) -> Tuple[dict[str, dict[str, list[VersionEntry]]], VersionPath]:
 
     result = OrderedDict()
-    current_version_path = (None, None, None)
+    current_version_path = VersionPath(None, None, None)
     for major, minor_verions in versions.items():
         for minor, patch_versions in minor_verions.items():
             for v in patch_versions:
@@ -471,10 +473,20 @@ def get_versions(versions: OrderedDict[str, OrderedDict[str, str]],
                     VersionEntry(v, get_url(v), get_diff_url(v) if get_diff_url is not None else None)
                 )
                 if v == current_version:
-                    current_version_path = (major, minor, v)
+                    current_version_path = VersionPath(major, minor, v)
 
     return result, current_version_path
 
+def find_version_path(versions: OrderedDict[str, OrderedDict[str, str]],
+                      version: str) -> VersionPath:
+    for major, minor_verions in versions.items():
+        for minor, patch_versions in minor_verions.items():
+            for v in patch_versions:
+                if v == version:
+                    return VersionPath(major, minor, v)
+
+    return VersionPath(None, None, None)
+
 def get_versions_cached(q, ctx, project):
     with ctx.versions_cache_lock:
         if project not in ctx.versions_cache:
@@ -501,6 +513,7 @@ def get_layout_template_context(q: Query, ctx: RequestContext, get_url_with_new_
         'projects': get_projects(ctx.config.project_dir),
         'versions': versions,
         'current_version_path': current_version_path,
+        'other_version_path': (None, None, None),
         'topbar_families': TOPBAR_FAMILIES,
         'elixir_version_string': ctx.config.version_string,
         'elixir_repo_url': ctx.config.repo_url,
@@ -920,7 +933,8 @@ def generate_warning(type, version):
                 warning = f'Files are the same in {version} and {version_other}.'
             else:
                 missing_version = version_other if type == 'blob' else version
-                warning = f'File does not exist, or is not a file in {missing_version}. ({version} displayed)'
+                shown_version = version if type == 'blob' else version_other
+                warning = f'File does not exist, or is not a file in {missing_version}. ({shown_version} displayed)'
 
             template_ctx = {
                 'code': generate_source(q, project, version if type == 'blob' else version_other, path),
@@ -952,6 +966,7 @@ def generate_warning(type, version):
         **get_layout_template_context(q, ctx, get_url_with_new_version, get_diff_url, project, version),
         **template_ctx,
 
+        'other_version_path': find_version_path(get_versions_cached(q, ctx, project), version_other),
         'diff_mode_available': True,
         'diff_checked': True,
         'diff_exit_url': stringify_source_path(project, version, path),

static/style.css

@@ -453,10 +453,13 @@ h2 {
   margin: 0;
 }
 .sidebar nav li.active a {
-  color: #eee;
   color: #6d7dd2;
   font-weight: 700;
 }
+.sidebar nav li.active-other a {
+  color: #d2c26d;
+  font-weight: 700;
+}
 .sidebar nav ul {
   padding: 0;
 }

templates/sidebar.html

@@ -28,9 +28,10 @@ <h3 class="screenreader">Versions</h3>
             {% endif %}
 
             {% set current_major, current_minor, current_version = current_version_path %}
+            {% set other_major, other_minor, other_version = other_version_path %}
             {% for major, major_versions in (versions|default({})).items() %}
             <li>
-                <span class="{{ 'active' if current_major == major else '' }}">{{ major }}</span>
+                <span class="{{ 'active' if major in (current_major, other_major) else '' }}">{{ major }}</span>
 
                 <ul>
                 {% for minor, minor_versions in major_versions.items() %}
@@ -40,10 +41,13 @@ <h3 class="screenreader">Versions</h3>
                         </li>
                     {% else %}
                         <li>
-                            <span class="{{ 'active' if minor == current_minor else '' }}">{{ minor }}</span>
+                            <span class="{{ 'active' if minor in (current_minor, other_minor) else '' }}">{{ minor }}</span>
                             <ul>
                                 {% for v in minor_versions %}
-                                    <li class="li-link {{ 'active' if v.version == current_tag else '' }}">
+                                    <li class="li-link
+                                               {{ 'active' if v.version == current_tag else '' }}
+                                               {{ 'active-other' if v.version == other_tag else '' }}
+                                        ">
                                         <a class="version-link-source" href="{{ v.url }}">
                                             {{ v.version }}
                                         </a>