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

Fix autocomplete when cursor is inside a comment or string

This commit is contained in:
Hackerpilot 2012-04-21 12:09:07 -07:00
parent 831ded10d0
commit f23c38f8ae
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autocomplete.d
View File

@ -238,10 +238,9 @@ struct AutoComplete
string parenComplete(size_t cursor) string parenComplete(size_t cursor)
{ {
auto index = assumeSorted(tokens).lowerBound(cursor).length; auto index = assumeSorted(tokens).lowerBound(cursor).length - 2;
if (index > 2) Token t = tokens[index];
index -= 2; if (t.startIndex + t.value.length + 1 != cursor)
else
return []; return [];
if (tokens[index] == TokenType.tVersion) if (tokens[index] == TokenType.tVersion)
{ {
@ -252,12 +251,11 @@ struct AutoComplete
string dotComplete(size_t cursor) string dotComplete(size_t cursor)
{ {
auto index = assumeSorted(tokens).lowerBound(cursor).length; auto index = assumeSorted(tokens).lowerBound(cursor).length - 2;
if (index > 2) Token t = tokens[index];
index -= 2; if (t.startIndex + t.value.length + 1 != cursor)
else
return ""; return "";
auto t = tokens[index]; stderr.writeln(t);
string[] chain = callChainBackwards(tokens, index); string[] chain = callChainBackwards(tokens, index);
auto type = getTypeOfExpression(chain, tokens, cursor); auto type = getTypeOfExpression(chain, tokens, cursor);