neovim

commit 62306a29add233958ead5311c0fc69a21c3acef3
parent 1e7e9ee91f73c62b8c5ba9dbdabba3a3b6dc0130
Author: L Lllvvuu <git@llllvvuu.dev>
Date:   Thu,  5 Oct 2023 02:35:29 -0700

fix(marktree): correct qsort usage

> The application shall ensure that the function returns an integer less
than, equal to, or greater than 0, if the first argument is considered
respectively less than, equal to, or greater than the second. If two
members compare as equal, their order in the sorted array is unspecified.

https://pubs.opengroup.org/onlinepubs/009696899/functions/qsort.html

Diffstat:
M
src/nvim/marktree.c
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c
@@ -1626,7 +1626,7 @@ static int damage_cmp(const void *s1, const void *s2)
 {
   Damage *d1 = (Damage *)s1, *d2 = (Damage *)s2;
   assert(d1->id != d2->id);
-  return d1->id > d2->id;
+  return d1->id > d2->id ? 1 : -1;
 }
 
 bool marktree_splice(MarkTree *b, int32_t start_line, int start_col, int old_extent_line,
@@ -1792,6 +1792,7 @@ past_continue_same_node:
 
     for (size_t i = 0; i < kv_size(damage); i++) {
       Damage d = kv_A(damage, i);
+      assert(i == 0 || d.id > kv_A(damage, i - 1).id);
       if (!(d.id & MARKTREE_END_FLAG)) {  // start
         if (i + 1 < kv_size(damage) && kv_A(damage, i + 1).id == (d.id | MARKTREE_END_FLAG)) {
           Damage d2 = kv_A(damage, i + 1);
@@ -2267,7 +2268,7 @@ void mt_inspect_dotfile_node(MarkTree *b, garray_T *ga, MTNode *n, MTPos off, ch
   if (parent != NULL) {
     snprintf(namebuf, sizeof namebuf, "%s_%c%d", parent, 'a' + n->level, n->p_idx);
   } else {
-    snprintf(namebuf, sizeof namebuf, "Node");
+    snprintf(namebuf, sizeof namebuf, "MTNode");
   }
 
   GA_PRINT("  %s[shape=plaintext, label=<\n", namebuf);