Mercurial > vim
view src/testdir/test_makeencoding.py @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
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:15:03 +0100 |
parents | e71d3bdf3bc3 |
children |
line wrap: on
line source
#!/usr/bin/python # -*- coding: utf-8 -*- # Test program for :make, :grep and :cgetfile. from __future__ import print_function, unicode_literals import locale import io import sys def set_output_encoding(enc=None): """Set the encoding of stdout and stderr arguments: enc -- Encoding name. If omitted, locale.getpreferredencoding() is used. """ if enc is None: enc = locale.getpreferredencoding() def get_text_writer(fo, **kwargs): kw = dict(kwargs) kw.setdefault('errors', 'backslashreplace') # use \uXXXX style kw.setdefault('closefd', False) if sys.version_info[0] < 3: # Work around for Python 2.x # New line conversion isn't needed here. Done in somewhere else. writer = io.open(fo.fileno(), mode='w', newline='', **kw) write = writer.write # save the original write() function enc = locale.getpreferredencoding() def convwrite(s): if isinstance(s, bytes): write(s.decode(enc)) # convert to unistr else: write(s) try: writer.flush() # needed on Windows except IOError: pass writer.write = convwrite else: writer = io.open(fo.fileno(), mode='w', **kw) return writer sys.stdout = get_text_writer(sys.stdout, encoding=enc) sys.stderr = get_text_writer(sys.stderr, encoding=enc) def main(): enc = 'utf-8' if len(sys.argv) > 1: enc = sys.argv[1] set_output_encoding(enc) message_tbl = { 'utf-8': 'ÀÈÌÒÙ こんにちは 你好', 'latin1': 'ÀÈÌÒÙ', 'cp932': 'こんにちは', 'cp936': '你好', } print('Xfoobar.c(10) : %s (%s)' % (message_tbl[enc], enc)) if __name__ == "__main__": main()