From 46ea058cfb56f411f594a1949c64075ca8e4a582 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Wed, 14 Jul 2021 20:41:41 +0200 Subject: [PATCH] fix --localUse off-by-one error (#640) --- src/dcd/server/autocomplete/localuse.d | 4 ++-- tests/tc033/run.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dcd/server/autocomplete/localuse.d b/src/dcd/server/autocomplete/localuse.d index 5ef9bcd..ff50693 100644 --- a/src/dcd/server/autocomplete/localuse.d +++ b/src/dcd/server/autocomplete/localuse.d @@ -84,8 +84,8 @@ public AutocompleteResponse findLocalUse(AutocompleteRequest request, { if (t.type != tok!"identifier") continue; - if (request.cursorPosition >= t.index && - request.cursorPosition < t.index + t.text.length) + if (request.cursorPosition > t.index && + request.cursorPosition <= t.index + t.text.length) { sourceToken = tokenArray.ptr + i; break; diff --git a/tests/tc033/run.sh b/tests/tc033/run.sh index 99131ee..af9ef17 100755 --- a/tests/tc033/run.sh +++ b/tests/tc033/run.sh @@ -3,3 +3,7 @@ set -u ../../bin/dcd-client $1 file.d -u -c22 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt diff actual1.txt expected1.txt + +# should work on last character of identifier +../../bin/dcd-client $1 file.d -u -c24 | sed s\""$(dirname "$(pwd)")"\"\" > actual2.txt +diff actual2.txt expected1.txt