From bbf58e6bbcc107e92d84730a33bd5a32440f5428 Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@protonmail.com>
Date: Sun, 15 May 2022 22:34:44 +0600
Subject: refactor(ui)!: link `VertSplit` to `Normal` by default

Avoids using `gui=reverse` on `VertSplit` and makes window separators
look much nicer by default.
---
 test/functional/ui/screen_basic_spec.lua | 192 +++++++++++++++----------------
 1 file changed, 96 insertions(+), 96 deletions(-)

(limited to 'test/functional/ui/screen_basic_spec.lua')

diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 09bcbc2bbd..6c872e52d3 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -326,12 +326,12 @@ local function screen_tests(linegrid)
         command('vsp')
         command('vsp')
         screen:expect([[
-          ^                    {3:│}                {3:│}               |
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
+          ^                    │                │               |
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
           {1:[No Name]            }{3:[No Name]        [No Name]      }|
                                                                |
           {0:~                                                    }|
@@ -343,12 +343,12 @@ local function screen_tests(linegrid)
         ]])
         insert('hello')
         screen:expect([[
-          hell^o               {3:│}hello           {3:│}hello          |
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-          {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
+          hell^o               │hello           │hello          |
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
+          {0:~                   }│{0:~               }│{0:~              }|
           {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
           hello                                                |
           {0:~                                                    }|
@@ -369,12 +369,12 @@ local function screen_tests(linegrid)
       command('vsp')
       insert('hello')
       screen:expect([[
-        hell^o               {3:│}hello           {3:│}hello          |
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
+        hell^o               │hello           │hello          |
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
         {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         hello                                                |
         {0:~                                                    }|
@@ -406,12 +406,12 @@ local function screen_tests(linegrid)
       command('tabprevious')
       screen:expect([[
         {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3:                         }{4:X}|
-        hell^o               {3:│}hello           {3:│}hello          |
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
-        {0:~                   }{3:│}{0:~               }{3:│}{0:~              }|
+        hell^o               │hello           │hello          |
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
+        {0:~                   }│{0:~               }│{0:~              }|
         {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         hello                                                |
         {0:~                                                    }|
@@ -520,36 +520,36 @@ local function screen_tests(linegrid)
 
       command('vsplit')
       screen:expect([[
-        ^foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
+        ^foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
         {1:[No Name] [+]              }{3:[No Name] [+]             }|
                                                              |
       ]])
 
       feed('<PageDown>')
       screen:expect([[
-        ^foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        foo                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
-        bar                       {3:│}foo                       |
+        ^foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        foo                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
+        bar                       │foo                       |
         {1:[No Name] [+]              }{3:[No Name] [+]             }|
                                                              |
       ]])
@@ -748,12 +748,12 @@ local function screen_tests(linegrid)
       command('vsp')
       command('vsp')
       screen:expect([[
-        and                 {3:│}and             {3:│}and            |
-        clearing            {3:│}clearing        {3:│}clearing       |
-        in                  {3:│}in              {3:│}in             |
-        split               {3:│}split           {3:│}split          |
-        windows             {3:│}windows         {3:│}windows        |
-        ^                    {3:│}                {3:│}               |
+        and                 │and             │and            |
+        clearing            │clearing        │clearing       |
+        in                  │in              │in             |
+        split               │split           │split          |
+        windows             │windows         │windows        |
+        ^                    │                │               |
         {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         clearing                                             |
         in                                                   |
@@ -768,12 +768,12 @@ local function screen_tests(linegrid)
     it('only affects the current scroll region', function()
       feed('6k')
       screen:expect([[
-        ^scrolling           {3:│}and             {3:│}and            |
-        and                 {3:│}clearing        {3:│}clearing       |
-        clearing            {3:│}in              {3:│}in             |
-        in                  {3:│}split           {3:│}split          |
-        split               {3:│}windows         {3:│}windows        |
-        windows             {3:│}                {3:│}               |
+        ^scrolling           │and             │and            |
+        and                 │clearing        │clearing       |
+        clearing            │in              │in             |
+        in                  │split           │split          |
+        split               │windows         │windows        |
+        windows             │                │               |
         {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         clearing                                             |
         in                                                   |
@@ -785,12 +785,12 @@ local function screen_tests(linegrid)
       ]])
       feed('<c-w>l')
       screen:expect([[
-        scrolling           {3:│}and                 {3:│}and        |
-        and                 {3:│}clearing            {3:│}clearing   |
-        clearing            {3:│}in                  {3:│}in         |
-        in                  {3:│}split               {3:│}split      |
-        split               {3:│}windows             {3:│}windows    |
-        windows             {3:│}^                    {3:│}           |
+        scrolling           │and                 │and        |
+        and                 │clearing            │clearing   |
+        clearing            │in                  │in         |
+        in                  │split               │split      |
+        split               │windows             │windows    |
+        windows             │^                    │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
@@ -802,12 +802,12 @@ local function screen_tests(linegrid)
       ]])
       feed('gg')
       screen:expect([[
-        scrolling           {3:│}^Inserting           {3:│}and        |
-        and                 {3:│}text                {3:│}clearing   |
-        clearing            {3:│}with                {3:│}in         |
-        in                  {3:│}many                {3:│}split      |
-        split               {3:│}lines               {3:│}windows    |
-        windows             {3:│}to                  {3:│}           |
+        scrolling           │^Inserting           │and        |
+        and                 │text                │clearing   |
+        clearing            │with                │in         |
+        in                  │many                │split      |
+        split               │lines               │windows    |
+        windows             │to                  │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
@@ -819,12 +819,12 @@ local function screen_tests(linegrid)
       ]])
       feed('7j')
       screen:expect([[
-        scrolling           {3:│}with                {3:│}and        |
-        and                 {3:│}many                {3:│}clearing   |
-        clearing            {3:│}lines               {3:│}in         |
-        in                  {3:│}to                  {3:│}split      |
-        split               {3:│}test                {3:│}windows    |
-        windows             {3:│}^scrolling           {3:│}           |
+        scrolling           │with                │and        |
+        and                 │many                │clearing   |
+        clearing            │lines               │in         |
+        in                  │to                  │split      |
+        split               │test                │windows    |
+        windows             │^scrolling           │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
@@ -836,12 +836,12 @@ local function screen_tests(linegrid)
       ]])
       feed('2j')
       screen:expect([[
-        scrolling           {3:│}lines               {3:│}and        |
-        and                 {3:│}to                  {3:│}clearing   |
-        clearing            {3:│}test                {3:│}in         |
-        in                  {3:│}scrolling           {3:│}split      |
-        split               {3:│}and                 {3:│}windows    |
-        windows             {3:│}^clearing            {3:│}           |
+        scrolling           │lines               │and        |
+        and                 │to                  │clearing   |
+        clearing            │test                │in         |
+        in                  │scrolling           │split      |
+        split               │and                 │windows    |
+        windows             │^clearing            │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
@@ -853,12 +853,12 @@ local function screen_tests(linegrid)
       ]])
       feed('5k')
       screen:expect([[
-        scrolling           {3:│}^lines               {3:│}and        |
-        and                 {3:│}to                  {3:│}clearing   |
-        clearing            {3:│}test                {3:│}in         |
-        in                  {3:│}scrolling           {3:│}split      |
-        split               {3:│}and                 {3:│}windows    |
-        windows             {3:│}clearing            {3:│}           |
+        scrolling           │^lines               │and        |
+        and                 │to                  │clearing   |
+        clearing            │test                │in         |
+        in                  │scrolling           │split      |
+        split               │and                 │windows    |
+        windows             │clearing            │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
@@ -870,12 +870,12 @@ local function screen_tests(linegrid)
       ]])
       feed('k')
       screen:expect([[
-        scrolling           {3:│}^many                {3:│}and        |
-        and                 {3:│}lines               {3:│}clearing   |
-        clearing            {3:│}to                  {3:│}in         |
-        in                  {3:│}test                {3:│}split      |
-        split               {3:│}scrolling           {3:│}windows    |
-        windows             {3:│}and                 {3:│}           |
+        scrolling           │^many                │and        |
+        and                 │lines               │clearing   |
+        clearing            │to                  │in         |
+        in                  │test                │split      |
+        split               │scrolling           │windows    |
+        windows             │and                 │           |
         {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
-- 
cgit