forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #467 from BBasile/issue-382 

fix #382 - No completion when current string is a keyword
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-04-25 00:37:20 +02:00 committed by GitHub
parent 24d415a537 5a8b2f7838
commit 22ecbbf5c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dcd/server/autocomplete/complete.d
View File

@ -57,6 +57,15 @@ public AutocompleteResponse complete(const AutocompleteRequest request,
auto stringCache = StringCache(StringCache.defaultBucketCount); auto stringCache = StringCache(StringCache.defaultBucketCount);
auto beforeTokens = getTokensBeforeCursor(request.sourceCode, auto beforeTokens = getTokensBeforeCursor(request.sourceCode,
request.cursorPosition, stringCache, tokenArray); request.cursorPosition, stringCache, tokenArray);
// allows to get completion on keyword, typically "is"
if (beforeTokens.length && isKeyword(beforeTokens[$-1].type))
{
Token* fakeIdent = cast(Token*) (&beforeTokens[$-1]);
fakeIdent.text = str(fakeIdent.type);
fakeIdent.type = tok!"identifier";
}
if (beforeTokens.length >= 2) if (beforeTokens.length >= 2)
{ {
if (beforeTokens[$ - 1] == tok!"(" || beforeTokens[$ - 1] == tok!"[" if (beforeTokens[$ - 1] == tok!"(" || beforeTokens[$ - 1] == tok!"["

2
tests/tc_complete_kw/expected1.txt Normal file
View File

@ -0,0 +1,2 @@
identifiers
isBig v

1
tests/tc_complete_kw/file1.d Normal file
View File

@ -0,0 +1 @@
bool isBig; void foo(){is}

1
tests/tc_complete_kw/file2.d Normal file
View File

@ -0,0 +1 @@
struct F{bool isBig;} void foo(){F f; f.is}

8
tests/tc_complete_kw/run.sh Executable file
View File

@ -0,0 +1,8 @@
set -e
set -u
../../bin/dcd-client $1 file1.d -c25 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client $1 file2.d -c42 > actual2.txt
diff actual2.txt expected1.txt