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

Minor code cleanup

This commit is contained in:
Hackerpilot 2015-08-13 00:25:19 -07:00
parent f42ba0cf1b
commit 9d87e8473d
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/server/autocomplete.d
View File

@ -184,18 +184,12 @@ public AutocompleteResponse symbolSearch(const AutocompleteRequest request,
} }
SearchResults results; SearchResults results;
foreach (symbol; pair.scope_.symbols) foreach (symbol; pair.scope_.symbols)
{
symbol.getAllPartsNamed(request.searchName, results); symbol.getAllPartsNamed(request.searchName, results);
}
foreach (s; moduleCache.getAllSymbols()) foreach (s; moduleCache.getAllSymbols())
{
s.symbol.getAllPartsNamed(request.searchName, results); s.symbol.getAllPartsNamed(request.searchName, results);
}
AutocompleteResponse response; AutocompleteResponse response;
foreach (result; results.tree[]) foreach (result; results.tree[])
{ {
response.locations ~= result.symbol.location; response.locations ~= result.symbol.location;
@ -260,7 +254,7 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray,
case tok!"stringLiteral": case tok!"stringLiteral":
case tok!"wstringLiteral": case tok!"wstringLiteral":
case tok!"dstringLiteral": case tok!"dstringLiteral":
foreach (symbol; (cast() arraySymbols)[]) foreach (symbol; arraySymbols)
{ {
response.completionKinds ~= symbol.kind; response.completionKinds ~= symbol.kind;
response.completions ~= symbol.name.dup; response.completions ~= symbol.name.dup;
@ -398,9 +392,9 @@ AutocompleteResponse parenCompletion(T)(T beforeTokens,
completions = pragmas; completions = pragmas;
fillResponse: fillResponse:
response.completionType = CompletionType.identifiers; response.completionType = CompletionType.identifiers;
for (size_t i = 0; i < completions.length; i++) foreach (completion; completions)
{ {
response.completions ~= completions[i]; response.completions ~= completion;
response.completionKinds ~= CompletionKind.keyword; response.completionKinds ~= CompletionKind.keyword;
} }
break; break;
@ -544,20 +538,11 @@ body
return response; return response;
} }
string path; immutable string path = beforeTokens[i + 1 .. j]
{ .filter!(token => token.type == tok!"identifier")
size_t k = 0; .map!(token => cast() token.text)
foreach (token; beforeTokens[i + 1 .. j]) .joiner(dirSeparator)
{ .text();
if (token.type == tok!"identifier")
{
if (k != 0)
path ~= "/";
path ~= token.text;
}
k++;
}
}
string resolvedLocation = moduleCache.resolveImportLocation(path); string resolvedLocation = moduleCache.resolveImportLocation(path);
if (resolvedLocation is null) if (resolvedLocation is null)