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

1 files changed, 44 insertions, 33 deletions

diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index 21f96628c0..82021dd98d 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -50,75 +50,83 @@ describe('wordcount', function()
     ]=])
 
     -- Test 1: empty window
-    eq(eval([=[
+    eq(
+      eval([=[
           [[''], {'chars': 0, 'cursor_chars': 0, 'words': 0, 'cursor_words': 0, 'bytes': 0, 'cursor_bytes': 0}]
         ]=]),
-       eval('DoRecordWin()')
-      )
+      eval('DoRecordWin()')
+    )
 
     -- Test 2: some words, cursor at start
     command([[call PutInWindow('one two three')]])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'one two three'], {'chars': 15, 'cursor_chars': 1, 'words': 3, 'cursor_words': 0, 'bytes': 15, 'cursor_bytes': 1}]
         ]=]),
-       eval('DoRecordWin([1, 1, 0])')
-      )
+      eval('DoRecordWin([1, 1, 0])')
+    )
 
     -- Test 3: some words, cursor at end
     command([[call PutInWindow('one two three')]])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'one two three'], {'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, 'bytes': 15, 'cursor_bytes': 14}]
         ]=]),
-       eval('DoRecordWin([2, 99, 0])')
-      )
+      eval('DoRecordWin([2, 99, 0])')
+    )
 
     -- Test 4: some words, cursor at end, ve=all
     command('set ve=all')
     command([[call PutInWindow('one two three')]])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'one two three'], {'chars': 15, 'cursor_chars': 15, 'words': 3, 'cursor_words': 3, 'bytes': 15, 'cursor_bytes': 15}]
         ]=]),
-       eval('DoRecordWin([2,99,0])')
-      )
+      eval('DoRecordWin([2,99,0])')
+    )
     command('set ve=')
 
     -- Test 5: several lines with words
     command([=[call PutInWindow(['one two three', 'one two three', 'one two three'])]=])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'one two three', 'one two three', 'one two three'], {'chars': 43, 'cursor_chars': 42, 'words': 9, 'cursor_words': 9, 'bytes': 43, 'cursor_bytes': 42}]
         ]=]),
-       eval('DoRecordWin([4,99,0])')
-      )
+      eval('DoRecordWin([4,99,0])')
+    )
 
     -- Test 6: one line with BOM set
     command([[call PutInWindow('one two three')]])
     command('wincmd k')
     command('set bomb')
     command('wincmd j')
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'one two three'], {'chars': 15, 'cursor_chars': 14, 'words': 3, 'cursor_words': 3, 'bytes': 18, 'cursor_bytes': 14}]
         ]=]),
-       eval('DoRecordWin([2,99,0])')
-      )
+      eval('DoRecordWin([2,99,0])')
+    )
     command('wincmd k')
     command('set nobomb')
     command('wincmd j')
 
     -- Test 7: one line with multibyte words
     command([=[call PutInWindow(['Äne M¤ne Müh'])]=])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'Äne M¤ne Müh'], {'chars': 14, 'cursor_chars': 13, 'words': 3, 'cursor_words': 3, 'bytes': 17, 'cursor_bytes': 16}]
         ]=]),
-       eval('DoRecordWin([2,99,0])')
-      )
+      eval('DoRecordWin([2,99,0])')
+    )
 
     -- Test 8: several lines with multibyte words
     command([=[call PutInWindow(['Äne M¤ne Müh', 'und raus bist dü!'])]=])
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'Äne M¤ne Müh', 'und raus bist dü!'], {'chars': 32, 'cursor_chars': 31, 'words': 7, 'cursor_words': 7, 'bytes': 36, 'cursor_bytes': 35}]
         ]=]),
-       eval('DoRecordWin([3,99,0])')
-      )
+      eval('DoRecordWin([3,99,0])')
+    )
 
     -- Test 9: visual mode, complete buffer
     command([=[call PutInWindow(['Äne M¤ne Müh', 'und raus bist dü!'])]=])
@@ -131,11 +139,12 @@ describe('wordcount', function()
     command('set stl= ls=1')
     command('let log=DoRecordWin([3,99,0])')
     command('let log[1]=g:visual_stat')
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'Äne M¤ne Müh', 'und raus bist dü!'], {'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 32, 'visual_words': 7, 'visual_bytes': 36}]
         ]=]),
-       eval('log')
-      )
+      eval('log')
+    )
 
     -- Test 10: visual mode (empty)
     command([=[call PutInWindow(['Äne M¤ne Müh', 'und raus bist dü!'])]=])
@@ -148,11 +157,12 @@ describe('wordcount', function()
     command('set stl= ls=1')
     command('let log=DoRecordWin([3,99,0])')
     command('let log[1]=g:visual_stat')
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'Äne M¤ne Müh', 'und raus bist dü!'], {'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 1, 'visual_words': 0, 'visual_bytes': 1}]
         ]=]),
-       eval('log')
-      )
+      eval('log')
+    )
 
     -- Test 11: visual mode, single line
     command([=[call PutInWindow(['Äne M¤ne Müh', 'und raus bist dü!'])]=])
@@ -165,10 +175,11 @@ describe('wordcount', function()
     command('set stl= ls=1')
     command('let log=DoRecordWin([3,99,0])')
     command('let log[1]=g:visual_stat')
-    eq(eval([=[
+    eq(
+      eval([=[
           [['', 'Äne M¤ne Müh', 'und raus bist dü!'], {'chars': 32, 'words': 7, 'bytes': 36, 'visual_chars': 13, 'visual_words': 3, 'visual_bytes': 16}]
         ]=]),
-       eval('log')
-      )
+      eval('log')
+    )
   end)
 end)