Merge remote-tracking branch 'upstream/master' into floattitlefloattitle

1 files changed, 246 insertions, 30 deletions

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index 789f1c6487..0a5eefbf38 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -31,6 +31,8 @@ describe('decorations providers', function()
       [12] = {foreground = tonumber('0x990000')};
       [13] = {background = Screen.colors.LightBlue};
       [14] = {background = Screen.colors.WebGray, foreground = Screen.colors.DarkBlue};
+      [15] = {special = Screen.colors.Blue1, undercurl = true},
+      [16] = {special = Screen.colors.Red, undercurl = true},
     }
   end)
 
@@ -56,7 +58,7 @@ describe('decorations providers', function()
       a.nvim_set_decoration_provider(_G.ns1, {
         on_start = on_do; on_buf = on_do;
         on_win = on_do; on_line = on_do;
-        on_end = on_do;
+        on_end = on_do; _on_spell_nav = on_do;
       })
       return _G.ns1
     ]])
@@ -95,7 +97,7 @@ describe('decorations providers', function()
                                               |
     ]]}
     check_trace {
-      { "start", 4, 40 };
+      { "start", 4 };
       { "win", 1000, 1, 0, 8 };
       { "line", 1000, 1, 0 };
       { "line", 1000, 1, 1 };
@@ -119,7 +121,7 @@ describe('decorations providers', function()
                                               |
     ]]}
     check_trace {
-      { "start", 5, 10 };
+      { "start", 5 };
       { "buf", 1 };
       { "win", 1000, 1, 0, 8 };
       { "line", 1000, 1, 6 };
@@ -156,6 +158,84 @@ describe('decorations providers', function()
     ]]}
   end)
 
+  it('can indicate spellchecked points', function()
+    exec [[
+    set spell
+    set spelloptions=noplainbuffer
+    syntax off
+    ]]
+
+    insert [[
+    I am well written text.
+    i am not capitalized.
+    I am a speling mistakke.
+    ]]
+
+    setup_provider [[
+      local ns = a.nvim_create_namespace "spell"
+      beamtrace = {}
+      local function on_do(kind, ...)
+        if kind == 'win' or kind == 'spell' then
+          a.nvim_buf_set_extmark(0, ns, 0, 0, { end_row = 2, end_col = 23, spell = true, ephemeral = true })
+        end
+        table.insert(beamtrace, {kind, ...})
+      end
+    ]]
+
+    check_trace {
+      { "start", 5 };
+      { "win", 1000, 1, 0, 5 };
+      { "line", 1000, 1, 0 };
+      { "line", 1000, 1, 1 };
+      { "line", 1000, 1, 2 };
+      { "line", 1000, 1, 3 };
+      { "end", 5 };
+    }
+
+    feed "gg0"
+
+    screen:expect{grid=[[
+    ^I am well written text.                 |
+    {15:i} am not capitalized.                   |
+    I am a {16:speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+
+    feed "]s"
+    check_trace {
+      { "spell", 1000, 1, 1, 0, 1, -1 };
+    }
+    screen:expect{grid=[[
+    I am well written text.                 |
+    {15:^i} am not capitalized.                   |
+    I am a {16:speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+
+    feed "]s"
+    check_trace {
+      { "spell", 1000, 1, 2, 7, 2, -1 };
+    }
+    screen:expect{grid=[[
+    I am well written text.                 |
+    {15:i} am not capitalized.                   |
+    I am a {16:^speling} {16:mistakke}.                |
+                                            |
+    {1:~                                       }|
+    {1:~                                       }|
+    {1:~                                       }|
+                                            |
+    ]]}
+  end)
+
   it('can predefine highlights', function()
     screen:try_resize(40, 16)
     insert(mulholland)
@@ -606,15 +686,15 @@ end]]
 
     screen:expect{grid=[[
       {5:^for} _,item {5:in} {6:ipairs}(items) {5:do}                    |
-          {5:local} text, hl_id_cell, count = unpack(item)  |
-          {5:if} hl_id_cell ~= {13:nil} {5:then}                     |
-              hl_id = hl_id_cell                        |
+          {5:local} text, hl_id_cell, count {5:=} unpack(item)  |
+          {5:if} hl_id_cell {5:~=} {13:nil} {5:then}                     |
+              hl_id {5:=} hl_id_cell                        |
           {5:end}                                           |
-          {5:for} _ = {13:1}, (count {5:or} {13:1}) {5:do}                    |
-              {5:local} cell = line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+          {5:for} _ {5:=} {13:1}, (count {5:or} {13:1}) {5:do}                    |
+              {5:local} cell {5:=} line[colpos]                 |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -633,15 +713,15 @@ end]]
 
     screen:expect{grid=[[
       {5:^for} _,item {5:in} {6:ipairs}(items) {5:do}                    |
-          {5:l}{8:blen}{7:dy}{10:e}{7:text}{10:h}{7:-}{10:_}{7:here}ell, count = unpack(item)  |
-          {5:i}{12:c}{11:ombining color} {13:nil} {5:then}                     |
+          {5:l}{8:blen}{7:dy}{10:e}{7:text}{10:h}{7:-}{10:_}{7:here}ell, count {5:=} unpack(item)  |
+          {5:i}{12:c}{11:ombining col}{12:or} {13:nil} {5:then}                     |
            {11:replacing color}d_cell                        |
           {5:e}{8:bl}{7:endy}{10: }{7:text}{10: }{7:-}{10: }{7:here}                           |
-          {5:f}{12:co}{11:mbini}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
+          {5:f}{12:co}{11:mbi}{12:n}{11:i}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
            {11:replacing color} line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -652,15 +732,15 @@ end]]
     feed 'V5G'
     screen:expect{grid=[[
       {17:for}{18: _,item }{17:in}{18: }{19:ipairs}{18:(items) }{17:do}                    |
-      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count = unpack(item)}  |
-      {18:    }{17:i}{12:c}{11:ombining color}{18: }{23:nil}{18: }{17:then}                     |
+      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count }{17:=}{18: unpack(item)}  |
+      {18:    }{17:i}{12:c}{11:ombining col}{12:or}{18: }{23:nil}{18: }{17:then}                     |
       {18:     }{11:replacing color}{18:d_cell}                        |
       {18:    }{5:^e}{17:nd}                                           |
-          {5:f}{12:co}{11:mbini}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
+          {5:f}{12:co}{11:mbi}{12:n}{11:i}{16:n}{11:g color}t {5:or} {13:1}) {5:do}                    |
            {11:replacing color} line[colpos]                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -671,15 +751,15 @@ end]]
     feed 'jj'
     screen:expect{grid=[[
       {17:for}{18: _,item }{17:in}{18: }{19:ipairs}{18:(items) }{17:do}                    |
-      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count = unpack(item)}  |
-      {18:    }{17:i}{12:c}{11:ombining color}{18: }{23:nil}{18: }{17:then}                     |
+      {18:    }{17:l}{20:blen}{21:dy}{22:e}{21:text}{22:h}{21:-}{22:_}{21:here}{18:ell, count }{17:=}{18: unpack(item)}  |
+      {18:    }{17:i}{12:c}{11:ombining col}{12:or}{18: }{23:nil}{18: }{17:then}                     |
       {18:     }{11:replacing color}{18:d_cell}                        |
       {18:    }{17:end}                                           |
-      {18:    }{17:for}{18: _ = }{23:1}{18:, (count }{17:or}{18: }{23:1}{18:) }{17:do}                    |
-      {18:    }^ {18:   }{17:local}{18: cell = line[colpos]}                 |
-              cell.text = text                          |
-              cell.hl_id = hl_id                        |
-              colpos = colpos+{13:1}                         |
+      {18:    }{17:for}{18: _ }{17:=}{18: }{23:1}{18:, (count }{17:or}{18: }{23:1}{18:) }{17:do}                    |
+      {18:    }^ {18:   }{17:local}{18: cell }{17:=}{18: line[colpos]}                 |
+              cell.text {5:=} text                          |
+              cell.hl_id {5:=} hl_id                        |
+              colpos {5:=} colpos{5:+}{13:1}                         |
           {5:end}                                           |
       {5:end}                                               |
       {1:~                                                 }|
@@ -1201,6 +1281,110 @@ if (h->n_buckets < new_n_buckets) { // expand
     ]]}
   end)
 
+  it('works beyond end of the buffer with virt_lines_above', function()
+    insert(example_text)
+    feed 'G'
+
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        }                                               |
+      ^}                                                 |
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    local id = meths.buf_set_extmark(0, ns, 8, 0, {
+      virt_lines={{{"Grugg"}}};
+      virt_lines_above = true,
+    })
+
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        }                                               |
+      ^}                                                 |
+      Grugg                                             |
+                                                        |
+    ]]}
+
+    feed('dd')
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+          h->vals_buf = new_vals;                       |
+        ^}                                               |
+      Grugg                                             |
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    feed('dk')
+    screen:expect{grid=[[
+      if (h->n_buckets < new_n_buckets) { // expand     |
+        khkey_t *new_keys = (khkey_t *)krealloc((void *)|
+      h->keys, new_n_buckets * sizeof(khkey_t));        |
+        h->keys = new_keys;                             |
+        if (kh_is_map && val_size) {                    |
+          ^char *new_vals = krealloc( h->vals_buf, new_n_|
+      buckets * val_size);                              |
+      Grugg                                             |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+                                                        |
+    ]]}
+
+    feed('dgg')
+    screen:expect{grid=[[
+      ^                                                  |
+      Grugg                                             |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      --No lines in buffer--                            |
+    ]]}
+
+    meths.buf_del_extmark(0, ns, id)
+    screen:expect{grid=[[
+      ^                                                  |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      --No lines in buffer--                            |
+    ]]}
+  end)
+
   it('does not cause syntax ml_get error at the end of a buffer #17816', function()
     command([[syntax region foo keepend start='^foo' end='^$']])
     command('syntax sync minlines=100')
@@ -1470,6 +1654,38 @@ if (h->n_buckets < new_n_buckets) { // expand
       }                                                 |
                                                         |
     ]]}
+
+    command 'set number'
+    screen:expect{grid=[[
+      {9:  1 }^if (h->n_buckets < new_n_buckets) { // expand |
+      {9:  2 }  khkey_t *new_keys = (khkey_t *)krealloc((voi|
+      {9:    }d *)h->keys, new_n_buckets * sizeof(khkey_t));|
+      {9:    }{1:>>}{2:  very    tabby}text   with    tabs          |
+      {9:  3 }  h->keys = new_keys;                         |
+      {9:  4 }  if (kh_is_map && val_size) {                |
+      {9:  5 }    char *new_vals = krealloc( h->vals_buf, ne|
+      {9:    }w_n_buckets * val_size);                      |
+      {9:  6 }    h->vals_buf = new_vals;                   |
+      {9:  7 }  }                                           |
+      {9:  8 }}                                             |
+                                                        |
+    ]]}
+
+    command 'set tabstop&'
+    screen:expect{grid=[[
+      {9:  1 }^if (h->n_buckets < new_n_buckets) { // expand |
+      {9:  2 }  khkey_t *new_keys = (khkey_t *)krealloc((voi|
+      {9:    }d *)h->keys, new_n_buckets * sizeof(khkey_t));|
+      {9:    }{1:>>}{2:      very    tabby}text       with    tabs  |
+      {9:  3 }  h->keys = new_keys;                         |
+      {9:  4 }  if (kh_is_map && val_size) {                |
+      {9:  5 }    char *new_vals = krealloc( h->vals_buf, ne|
+      {9:    }w_n_buckets * val_size);                      |
+      {9:  6 }    h->vals_buf = new_vals;                   |
+      {9:  7 }  }                                           |
+      {9:  8 }}                                             |
+                                                        |
+    ]]}
   end)
 
 end)