From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sat, 12 Jan 2019 15:16:48 +0000 (+0100)
Subject: doxygen: properly prefer shorter prefix.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=ebb839a35c99699c81190dd97f48ca2efb0e8500;p=blog.git

doxygen: properly prefer shorter prefix.

The prefix_length is usually 0, since it's used for aliases, not
indicating the actual prefix length. So use the whole result length
instead.
---

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index e8028a82..ba290a3f 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -316,8 +316,9 @@ class Trie:
                 # Third on suffix length (shortest first)
                 entry.suffix_length,
 
-                # Lastly on prefix length (shortest first)
-                entry.prefix_length
+                # Lastly on full name length (or prefix length, also shortest
+                # first)
+                len(entry.name)
             ]
 
         self._sort(key)
diff --git a/doxygen/test/test_search.py b/doxygen/test/test_search.py
index e25c505b..c6b71c5f 100755
--- a/doxygen/test/test_search.py
+++ b/doxygen/test/test_search.py
@@ -465,9 +465,9 @@ class [20]
 |          ) [12, 15, 19, 17]
 a group [29, 28]
 | page [52]
-value [31, 41]
+value [41, 31]
 | riable [48]
-enum [34, 44]
+enum [44, 34]
 |   :$
 |    :deprecatedvalue [33]
 |     onlyabrief [40]