Merge pull request #137 from yazd/fixes116

Fixes #116: autocomplete modules/packages after import keyword directly
This commit is contained in:
Hackerpilot 2014-05-30 16:52:41 +00:00
commit b64ac8be7a
1 changed files with 2 additions and 2 deletions

View File

@ -667,15 +667,15 @@ void setImportCompletions(T)(T tokens, ref AutocompleteResponse response)
{ {
response.completionType = CompletionType.identifiers; response.completionType = CompletionType.identifiers;
auto moduleParts = tokens.filter!(a => a.type == tok!"identifier").map!("a.text").array(); auto moduleParts = tokens.filter!(a => a.type == tok!"identifier").map!("a.text").array();
if (moduleParts.length == 0)
return;
string path = buildPath(moduleParts); string path = buildPath(moduleParts);
foreach (importDirectory; ModuleCache.getImportPaths()) foreach (importDirectory; ModuleCache.getImportPaths())
{ {
string p = buildPath(importDirectory, path); string p = buildPath(importDirectory, path);
Log.trace("Checking for ", p); Log.trace("Checking for ", p);
if (!exists(p)) if (!exists(p))
continue; continue;
foreach (string name; dirEntries(p, SpanMode.shallow)) foreach (string name; dirEntries(p, SpanMode.shallow))
{ {
if (isFile(name) && (name.endsWith(".d") || name.endsWith(".di"))) if (isFile(name) && (name.endsWith(".d") || name.endsWith(".di")))