From be29de1fa2b2dde54f4e43bc12d8bb7a46845308 Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Sat, 20 Jun 2015 17:16:10 -0300
Subject: defaults: set 'listchars' to "tab:> ,trail:-,nbsp:+". #2872

Re: https://github.com/neovim/neovim/issues/2676
---
 test/functional/legacy/listchars_spec.lua  |  5 ++++-
 test/functional/ui/syntax_conceal_spec.lua | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'test/functional')

diff --git a/test/functional/legacy/listchars_spec.lua b/test/functional/legacy/listchars_spec.lua
index e6c64daed7..89ed90178b 100644
--- a/test/functional/legacy/listchars_spec.lua
+++ b/test/functional/legacy/listchars_spec.lua
@@ -5,7 +5,10 @@ local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe("'listchars'", function()
-  before_each(clear)
+  before_each(function()
+    clear()
+    execute('set listchars&vi')
+  end)
 
   it("works with 'list'", function()
     source([[
diff --git a/test/functional/ui/syntax_conceal_spec.lua b/test/functional/ui/syntax_conceal_spec.lua
index ebfe067bbe..66ea779011 100644
--- a/test/functional/ui/syntax_conceal_spec.lua
+++ b/test/functional/ui/syntax_conceal_spec.lua
@@ -159,11 +159,13 @@ describe('Screen', function()
         ]])
       end)
 
-      it('initially and conceal its start tag and end tag.', function() 
-        execute("syn region rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")  
+      it('initially and conceal its start tag and end tag.', function()
+        -- concealends has a known bug (todo.txt) where the first match won't
+        -- be replaced with cchar.
+        execute("syn region rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
         screen:expect([[
-          {1:-} a region of text {1:-}                                 |
-          {1:-} a region of text {1:-}                                 |
+          {1: } a region of text {1:-}                                 |
+          {1: } a region of text {1:-}                                 |
           ^                                                     |
           ~                                                    |
           ~                                                    |
@@ -179,9 +181,9 @@ describe('Screen', function()
         execute("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")  
         insert("<r> A region with <r> a nested <r> nested region.</r> </r> </r>\n")
         screen:expect([[
-          {1:-} a region of text {1:-}                                 |
-          {1:-} a region of text {1:-}                                 |
-          {1:-} A region with {1:-} a nested {1:-} nested region.{1:-}         |
+          {1: } a region of text {1:-}                                 |
+          {1: } a region of text {1:-}                                 |
+          {1: } A region with {1: } a nested {1: } nested region.{1:-}         |
            {1:-} {1:-}                                                 |
           ^                                                     |
           ~                                                    |
@@ -281,7 +283,7 @@ describe('Screen', function()
       execute("let &conceallevel=1")
       screen:expect([[
         // No Conceal                                        |
-        {1:-}                                                    |
+        {1: }                                                    |
         {1:C}                                                    |
                                                              |
         ^                                                     |
-- 
cgit