IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4388: dead code in op_insert()

Browse Source 
Problem:    Dead code in op_insert().
Solution:   Remove condition and else block. (closes vim/vim#9782)
7745f14ef3
This commit is contained in:
zeertzjq 2022-02-15 20:53:24 +08:00
parent 0072a97b2e
commit a2c3d431d6
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/nvim/ops.c
View File

@ -2318,33 +2318,24 @@ void op_insert(oparg_T *oap, long count1)
// The user may have moved the cursor before inserting something, try // The user may have moved the cursor before inserting something, try
// to adjust the block for that. But only do it, if the difference // to adjust the block for that. But only do it, if the difference
// does not come from indent kicking in. // does not come from indent kicking in.
if (oap->start.lnum == curbuf->b_op_start_orig.lnum if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX && !did_indent) {
&& !bd.is_MAX
&& !did_indent) {
const int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd); const int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd);
if (!bd.is_MAX) { if (oap->op_type == OP_INSERT
if (oap->op_type == OP_INSERT && oap->start.col + oap->start.coladd
&& oap->start.col + oap->start.coladd != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
!= curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) { oap->start.col = curbuf->b_op_start_orig.col;
oap->start.col = curbuf->b_op_start_orig.col; pre_textlen -= t - oap->start_vcol;
pre_textlen -= t - oap->start_vcol; oap->start_vcol = t;
oap->start_vcol = t; } else if (oap->op_type == OP_APPEND
} else if (oap->op_type == OP_APPEND && oap->start.col + oap->start.coladd
&& oap->start.col + oap->start.coladd >= curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
>= curbuf->b_op_start_orig.col oap->start.col = curbuf->b_op_start_orig.col;
+ curbuf->b_op_start_orig.coladd) {
oap->start.col = curbuf->b_op_start_orig.col;
// reset pre_textlen to the value of OP_INSERT
pre_textlen += bd.textlen;
pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
oap->op_type = OP_INSERT;
}
} else if (bd.is_MAX && oap->op_type == OP_APPEND) {
// reset pre_textlen to the value of OP_INSERT // reset pre_textlen to the value of OP_INSERT
pre_textlen += bd.textlen; pre_textlen += bd.textlen;
pre_textlen -= t - oap->start_vcol; pre_textlen -= t - oap->start_vcol;
oap->start_vcol = t;
oap->op_type = OP_INSERT;
} }
} }