diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-30 02:27:37 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-31 09:01:40 -0400 |
| commit | f772117b55da1bb4409b88ee4cfb30fc6bb15622 (patch) | |
| tree | 18d58752209497ea4332bf4d783abae53de29dc4 /src | |
| parent | 1782550bfe6796303a893fa7c2a5675e0e383129 (diff) | |
| download | rneovim-f772117b55da1bb4409b88ee4cfb30fc6bb15622.tar.gz rneovim-f772117b55da1bb4409b88ee4cfb30fc6bb15622.tar.bz2 rneovim-f772117b55da1bb4409b88ee4cfb30fc6bb15622.zip | |
eval: diff_hlID() and hlID() return same id
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_diffmode.vim | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index c324a9f1a2..66c46e2478 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8008,7 +8008,7 @@ static void f_diff_hlID(typval_T *argvars, typval_T *rettv, FunPtr fptr) hlID = HLF_CHD; // Changed line. } } - rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID; + rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)(hlID + 1); } /* diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index c3c3fb1f63..b2e75265a6 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -683,13 +683,17 @@ func Test_diff_hlID() call assert_equal(synIDattr(diff_hlID(-1, 1), "name"), "") + call assert_equal(diff_hlID(1, 1), hlID("DiffChange")) call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange") + call assert_equal(diff_hlID(1, 2), hlID("DiffText")) call assert_equal(synIDattr(diff_hlID(1, 2), "name"), "DiffText") call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "") + call assert_equal(diff_hlID(3, 1), hlID("DiffAdd")) call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "DiffAdd") call assert_equal(synIDattr(diff_hlID(4, 1), "name"), "") wincmd w + call assert_equal(diff_hlID(1, 1), hlID("DiffChange")) call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange") call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "") call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "") |