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

Fix #177

This commit is contained in:
Hackerpilot 2015-01-03 17:00:28 -08:00
parent 0f2ffbd31c
commit a422d7f47c
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/autocomplete.d
View File

@ -918,20 +918,7 @@ body
*/ */
T getExpression(T)(T beforeTokens) T getExpression(T)(T beforeTokens)
{ {
if (beforeTokens.length == 0) enum TYPE_IDENT_AND_LITERAL_CASES = q{
return beforeTokens[0 .. 0];
size_t i = beforeTokens.length - 1;
size_t sliceEnd = beforeTokens.length;
IdType open;
IdType close;
uint skipCount = 0;
expressionLoop: while (true)
{
switch (beforeTokens[i].type)
{
case tok!"import":
break expressionLoop;
case tok!"int": case tok!"int":
case tok!"uint": case tok!"uint":
case tok!"long": case tok!"long":
@ -960,6 +947,31 @@ T getExpression(T)(T beforeTokens)
case tok!"stringLiteral": case tok!"stringLiteral":
case tok!"wstringLiteral": case tok!"wstringLiteral":
case tok!"dstringLiteral": case tok!"dstringLiteral":
};
if (beforeTokens.length == 0)
return beforeTokens[0 .. 0];
size_t i = beforeTokens.length - 1;
size_t sliceEnd = beforeTokens.length;
IdType open;
IdType close;
uint skipCount = 0;
expressionLoop: while (true)
{
switch (beforeTokens[i].type)
{
case tok!"import":
break expressionLoop;
mixin (TYPE_IDENT_AND_LITERAL_CASES);
if (i + 1 < beforeTokens.length) switch (beforeTokens[i + 1].type)
{
mixin (TYPE_IDENT_AND_LITERAL_CASES);
i++;
break expressionLoop;
default:
break;
}
if (i > 0 && beforeTokens[i - 1] == tok!"!") if (i > 0 && beforeTokens[i - 1] == tok!"!")
{ {
sliceEnd -= 2; sliceEnd -= 2;