view src/testdir/test_fixeol.vim @ 34682:a36144b38683 v9.1.0222

patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text Commit: https://github.com/vim/vim/commit/fe0a76b2bca12b13982ad66bafadc0d6c1681d00 Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Date: Thu Mar 28 11:47:32 2024 +0100 patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text Problem: When a line is truncated just before 'after'/'right' virtual text and the line also has 'below' virtual text, then the 'below' virtual text would not be displayed, depending on the order these text properties were added. Solution: In the loop to make text properties active, skip instead of break for 'after'/'right' virtual text properties that are ignored due to truncation, so following 'below' text properties can still be made active. Similarly, a loop is needed to determine if a text property follows at the end of the screen. (Dylan Thacker-Smith) related: #14307 Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Mar 2024 12:00:04 +0100
parents 92b1338023ee
children
line wrap: on
line source

" Tests for 'fixeol', 'eof' and 'eol'

func Test_fixeol()
  " first write two test files – with and without trailing EOL
  " use Unix fileformat for consistency
  set ff=unix
  enew!
  call setline('.', 'with eol or eof')
  w! XXEol
  enew!
  set noeof noeol nofixeol
  call setline('.', 'without eol or eof')
  w! XXNoEol
  set eol eof fixeol
  bwipe XXEol XXNoEol

  " try editing files with 'fixeol' disabled
  e! XXEol
  normal ostays eol
  set nofixeol
  w! XXTestEol
  e! XXNoEol
  normal ostays without
  set nofixeol
  w! XXTestNoEol
  bwipe! XXEol XXNoEol XXTestEol XXTestNoEol
  set fixeol

  " Append "END" to each file so that we can see what the last written char
  " was.
  normal ggdGaEND
  w >>XXEol
  w >>XXNoEol
  w >>XXTestEol
  w >>XXTestNoEol

  call assert_equal(['with eol or eof', 'END'], readfile('XXEol'))
  call assert_equal(['without eol or eofEND'], readfile('XXNoEol'))
  call assert_equal(['with eol or eof', 'stays eol', 'END'], readfile('XXTestEol'))
  call assert_equal(['without eol or eof', 'stays withoutEND'],
	      \ readfile('XXTestNoEol'))

  call delete('XXEol')
  call delete('XXNoEol')
  call delete('XXTestEol')
  call delete('XXTestNoEol')
  set ff& fixeol& eof& eol&
  enew!
endfunc

func Test_eof()
  let data = 0z68656c6c6f.0d0a.776f726c64   " "hello\r\nworld"

  " 1. Eol, Eof
  " read
  call writefile(data + 0z0d0a.1a, 'XXEolEof')
  e! XXEolEof
  call assert_equal(['hello', 'world'], getline(1, 2))
  call assert_equal([1, 1], [&eol, &eof])
  " write
  set fixeol
  w!
  call assert_equal(data + 0z0d0a, readblob('XXEolEof'))
  set nofixeol
  w!
  call assert_equal(data + 0z0d0a.1a, readblob('XXEolEof'))

  " 2. NoEol, Eof
  " read
  call writefile(data + 0z1a, 'XXNoEolEof')
  e! XXNoEolEof
  call assert_equal(['hello', 'world'], getline(1, 2))
  call assert_equal([0, 1], [&eol, &eof])
  " write
  set fixeol
  w!
  call assert_equal(data + 0z0d0a, readblob('XXNoEolEof'))
  set nofixeol
  w!
  call assert_equal(data + 0z1a, readblob('XXNoEolEof'))

  " 3. Eol, NoEof
  " read
  call writefile(data + 0z0d0a, 'XXEolNoEof')
  e! XXEolNoEof
  call assert_equal(['hello', 'world'], getline(1, 2))
  call assert_equal([1, 0], [&eol, &eof])
  " write
  set fixeol
  w!
  call assert_equal(data + 0z0d0a, readblob('XXEolNoEof'))
  set nofixeol
  w!
  call assert_equal(data + 0z0d0a, readblob('XXEolNoEof'))

  " 4. NoEol, NoEof
  " read
  call writefile(data, 'XXNoEolNoEof')
  e! XXNoEolNoEof
  call assert_equal(['hello', 'world'], getline(1, 2))
  call assert_equal([0, 0], [&eol, &eof])
  " write
  set fixeol
  w!
  call assert_equal(data + 0z0d0a, readblob('XXNoEolNoEof'))
  set nofixeol
  w!
  call assert_equal(data, readblob('XXNoEolNoEof'))

  call delete('XXEolEof')
  call delete('XXNoEolEof')
  call delete('XXEolNoEof')
  call delete('XXNoEolNoEof')
  set ff& fixeol& eof& eol&
  enew!
endfunc

" vim: shiftwidth=2 sts=2 expandtab