Mercurial > vim
view src/testdir/test_netbeans.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 | 8492bbc9f533 |
children |
line wrap: on
line source
#!/usr/bin/python # # Server that will communicate with Vim through the netbeans interface. # Used by test_netbeans.vim. # # This requires Python 2.6 or later. from __future__ import print_function import socket import sys import time import threading import re try: # Python 3 import socketserver except ImportError: # Python 2 import SocketServer as socketserver class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): def process_msgs(self, msgbuf): # Process all the received netbeans commands/responses/events from Vim. # Each one is separated by a newline character. If a partial command # is received, process it later after the rest of it is received. while True: (line, sep, rest) = msgbuf.partition('\n') if sep == '': # received partial line return line msgbuf = rest # Process a command only after receiving a newline. response = '' if line.find('Xcmdbuf') > 0: name = line.split('"')[1] response = '1:putBufferNumber!15 "' + name + '"\n' response += '1:startDocumentListen!16\n' elif re.match('1:insert=.* "\\\\n"', line): # extract the command from the previous line cmd = re.search('.*"(.*)"', self.prev_line).group(1) # map of test names and the netbeans commands/functions testmap = { 'getCursor_Test' : '0:getCursor/30\n', 'E627_Test' : '0 setReadOnly!31\n', 'E628_Test' : '0:setReadOnly 32\n', 'E632_Test' : '0:getLength/33\n', 'E633_Test' : '0:getText/34\n', 'E634_Test' : '0:remove/35 1 1\n', 'E635_Test' : '0:insert/36 0 "line1\\n"\n', 'E636_Test' : '0:create!37\n', 'E637_Test' : '0:startDocumentListen!38\n', 'E638_Test' : '0:stopDocumentListen!39\n', 'E639_Test' : '0:setTitle!40 "Title"\n', 'E640_Test' : '0:initDone!41\n', 'E641_Test' : '0:putBufferNumber!42 "XSomeBuf"\n', 'E642_Test' : '9:putBufferNumber!43 "XInvalidBuf"\n', 'E643_Test' : '0:setFullName!44 "XSomeBuf"\n', 'E644_Test' : '0:editFile!45 "Xfile3"\n', 'E645_Test' : '0:setVisible!46 T\n', 'E646_Test' : '0:setModified!47 T\n', 'E647_Test' : '0:setDot!48 1/1\n', 'E648_Test' : '0:close!49\n', 'E650_Test' : '0:defineAnnoType!50 1 "abc" "a" "a" 1 1\n', 'E651_Test' : '0:addAnno!51 1 1 1 1\n', 'E652_Test' : '0:getAnno/52 8\n', 'editFile_Test' : '2:editFile!53 "Xfile3"\n', 'getLength_Test' : '2:getLength/54\n', 'getModified_Test' : '2:getModified/55\n', 'getText_Test' : '2:getText/56\n', 'setDot_Test' : '2:setDot!57 3/6\n', 'setDot2_Test' : '2:setDot!57 9\n', 'startDocumentListen_Test' : '2:startDocumentListen!58\n', 'stopDocumentListen_Test' : '2:stopDocumentListen!59\n', 'define_anno_Test' : '2:defineAnnoType!60 1 "s1" "x" "=>" blue none\n', 'E532_Test' : '2:defineAnnoType!61 1 "s1" "x" "=>" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa none\n', 'add_anno_Test' : '2:addAnno!62 1 1 2/1 0\n', 'get_anno_Test' : '2:getAnno/63 1\n', 'remove_anno_Test' : '2:removeAnno!64 1\n', 'getModifiedAll_Test' : '0:getModified/65\n', 'create_Test' : '3:create!66\n', 'setTitle_Test' : '3:setTitle!67 "Xfile4"\n', 'setFullName_Test' : '3:setFullName!68 "Xfile4"\n', 'initDone_Test' : '3:initDone!69\n', 'setVisible_Test' : '3:setVisible!70 T\n', 'setModtime_Test' : '3:setModtime!71 6\n', 'insert_Test' : '3:insert/72 0 "line1\\nline2\\n"\n', 'remove_Test' : '3:remove/73 3 4\n', 'remove_invalid_offset_Test' : '3:remove/74 900 4\n', 'remove_invalid_count_Test' : '3:remove/75 1 800\n', 'guard_Test' : '3:guard!76 8 7\n', 'setModified_Test' : '3:setModified!77 T\n', 'setModifiedClear_Test' : '3:setModified!77 F\n', 'insertDone_Test' : '3:insertDone!78 T F\n', 'saveDone_Test' : '3:saveDone!79\n', 'invalidcmd_Test' : '3:invalidcmd!80\n', 'invalidfunc_Test' : '3:invalidfunc/81\n', 'removeAnno_fail_Test' : '0:removeAnno/82 1\n', 'guard_fail_Test' : '0:guard/83 1 1\n', 'save_fail_Test' : '0:save/84\n', 'netbeansBuffer_fail_Test' : '0:netbeansBuffer/85 T\n', 'setExitDelay_Test' : '0:setExitDelay!86 2\n', 'setReadOnly_Test' : '3:setReadOnly!87 T\n', 'setReadOnlyClear_Test' : '3:setReadOnly!88 F\n', 'save_Test' : '3:save!89\n', 'close_Test' : '3:close!90\n', 'specialKeys_Test' : '0:specialKeys!91 "F12 F13 C-F13"\n', 'nbbufwrite_Test' : '4:editFile!92 "XnbBuffer"\n4:netbeansBuffer!93 T\n', 'startAtomic_Test' : '0:startAtomic!94\n', 'endAtomic_Test' : '0:endAtomic!95\n', 'AnnoScale_Test' : "".join(['2:defineAnnoType!60 ' + str(i) + ' "s' + str(i) + '" "x" "=>" blue none\n' for i in range(2, 26)]), 'detach_Test' : '2:close!96\n1:close!97\nDETACH\n' } # execute the specified test if cmd not in testmap: print("=== invalid command %s ===" % (cmd)) else: response = testmap[cmd] elif line.find('disconnect') > 0: # we're done self.server.shutdown() return # save the current line, this is used as the test to run after # receiving a newline only line. self.prev_line = line if len(response) > 0: self.request.sendall(response.encode('utf-8')) # Write the response into the file, so that the test can knows # the command was sent. with open("Xnetbeans", "a") as myfile: myfile.write('send: ' + response) if self.debug: with open("save_Xnetbeans", "a") as myfile: myfile.write('send: ' + response) def handle(self): print("=== socket opened ===") # To preserve the Xnetbeans file as save_Xnetbeans, set debug to 1 self.debug = 0 self.prev_line = '' msgbuf = '' while True: try: received = self.request.recv(4096).decode('utf-8') except socket.error: print("=== socket error ===") break except IOError: print("=== socket closed ===") break if received == '': print("=== socket closed ===") break print("received: {0}".format(received)) # Write the received line into the file, so that the test can check # what happened. with open("Xnetbeans", "a") as myfile: myfile.write(received) if self.debug: with open("save_Xnetbeans", "a") as myfile: myfile.write(received) # Can receive more than one line in a response or a partial line. # Accumulate all the received characters and process one line at # a time. msgbuf += received msgbuf = self.process_msgs(msgbuf) class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): pass def writePortInFile(port): # Write the port number in Xportnr, so that the test knows it. f = open("Xportnr", "w") f.write("{0}".format(port)) f.close() if __name__ == "__main__": HOST, PORT = "localhost", 0 addrs = socket.getaddrinfo(HOST, PORT, 0, 0, socket.IPPROTO_TCP) # Each addr is a (family, type, proto, canonname, sockaddr) tuple sockaddr = addrs[0][4] ThreadedTCPServer.address_family = addrs[0][0] server = ThreadedTCPServer(sockaddr[0:2], ThreadedTCPRequestHandler) ip, port = server.server_address[0:2] # Start a thread with the server. That thread will then start a new thread # for each connection. server_thread = threading.Thread(target=server.serve_forever) server_thread.start() writePortInFile(port) print("Listening on port {0}".format(port)) # Main thread terminates, but the server continues running # until server.shutdown() is called. try: while server_thread.is_alive(): server_thread.join(1) except (KeyboardInterrupt, SystemExit): server.shutdown()