forked from aniani/vim
		
	patch 9.0.1327: cursor in wrong position below line with virtual text below
Problem:    Cursor in wrong position below line with virtual text below ending
            in multi-byte character.
Solution:   When checking for last character take care of multi-byte
            character.
			
			
This commit is contained in:
		| @@ -1196,7 +1196,7 @@ win_lbr_chartabsize( | ||||
| 		       || (tp->tp_col == MAXCOL | ||||
| 			   && ((tp->tp_flags & TP_FLAG_ALIGN_ABOVE) | ||||
| 				? col == 0 | ||||
| 				: (s[0] == NUL || s[1] == NUL) | ||||
| 				: (s[0] == NUL || s[charlen] == NUL) | ||||
| 						  && cts->cts_with_trailing))) | ||||
| 		    && -tp->tp_id - 1 < gap->ga_len) | ||||
| 	    { | ||||
|   | ||||
							
								
								
									
										10
									
								
								src/testdir/dumps/Test_prop_multibyte_below_1.dump
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								src/testdir/dumps/Test_prop_multibyte_below_1.dump
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| | +0#af5f00255#ffffff0@1|1| |©+0#0000000&| @54 | ||||
| | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52 | ||||
| | +0#af5f00255&@1|2| |©+0#0000000&| @54 | ||||
| | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52 | ||||
| | +0#af5f00255&@1|3| >©+0#0000000&| @54 | ||||
| | +0#af5f00255&@3|++0#0000001#ffff4012@2| +0#0000000#ffffff0@52 | ||||
| |~+0#4040ff13&| @58 | ||||
| |~| @58 | ||||
| |~| @58 | ||||
| | +0#0000000&@41|3|,|1| @10|A|l@1|  | ||||
| @@ -2817,6 +2817,27 @@ func Test_prop_with_text_above_below_empty() | ||||
|   call StopVimInTerminal(buf) | ||||
| endfunc | ||||
|  | ||||
| func Test_prop_with_multibyte_below() | ||||
|   CheckRunVimInTerminal | ||||
|  | ||||
|   let lines =<< trim END | ||||
|       setlocal number | ||||
|       call setline(1, ['©', '©', '©']) | ||||
|  | ||||
|       let vt = 'test' | ||||
|       call prop_type_add(vt, {'highlight': 'ToDo'}) | ||||
|       for ln in range(1, line('$')) | ||||
|         call prop_add(ln, 0, {'type': vt, 'text': '+++', 'text_align': 'below'}) | ||||
|       endfor | ||||
|       normal G | ||||
|   END | ||||
|   call writefile(lines, 'XscriptPropMultibyteBelow', 'D') | ||||
|   let buf = RunVimInTerminal('-S XscriptPropMultibyteBelow', #{rows: 10, cols: 60}) | ||||
|   call VerifyScreenDump(buf, 'Test_prop_multibyte_below_1', {}) | ||||
|  | ||||
|   call StopVimInTerminal(buf) | ||||
| endfunc | ||||
|  | ||||
| func Test_prop_with_text_above_empty() | ||||
|   CheckRunVimInTerminal | ||||
|  | ||||
|   | ||||
| @@ -695,6 +695,8 @@ static char *(features[]) = | ||||
|  | ||||
| static int included_patches[] = | ||||
| {   /* Add new patch number below this line */ | ||||
| /**/ | ||||
|     1327, | ||||
| /**/ | ||||
|     1326, | ||||
| /**/ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user