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

Added support for single files as import paths (fix #278)

This commit is contained in:
WebFreak001 2016-06-05 02:03:16 +02:00
parent ea2eca23c9
commit b810daaa8f
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/server/autocomplete.d
View File

@ -643,35 +643,53 @@ void setImportCompletions(T)(T tokens, ref AutocompleteResponse response,
bool found = false; bool found = false;
foreach (importDirectory; cache.getImportPaths()) foreach (importPath; cache.getImportPaths())
{ {
string p = buildPath(importDirectory, path); if (importPath.isFile)
if (!exists(p))
continue;
found = true;
foreach (string name; dirEntries(p, SpanMode.shallow))
{ {
import std.path: baseName; if (!exists(importPath))
if (name.baseName.startsWith(".#"))
continue; continue;
auto n = name.baseName(".d").baseName(".di"); found = true;
if (isFile(name) && (name.endsWith(".d") || name.endsWith(".di"))
&& (partial is null || n.startsWith(partial))) auto n = importPath.baseName(".d").baseName(".di");
if (isFile(importPath) && (importPath.endsWith(".d") || importPath.endsWith(".di"))
&& (partial is null || n.startsWith(partial)))
{ {
response.completions ~= n; response.completions ~= n;
response.completionKinds ~= CompletionKind.moduleName; response.completionKinds ~= CompletionKind.moduleName;
} }
else if (isDir(name)) }
else
{
string p = buildPath(importPath, path);
if (!exists(p))
continue;
found = true;
foreach (string name; dirEntries(p, SpanMode.shallow))
{ {
if (n[0] != '.' && (partial is null || n.startsWith(partial))) import std.path: baseName;
if (name.baseName.startsWith(".#"))
continue;
auto n = name.baseName(".d").baseName(".di");
if (isFile(name) && (name.endsWith(".d") || name.endsWith(".di"))
&& (partial is null || n.startsWith(partial)))
{ {
response.completions ~= n; response.completions ~= n;
response.completionKinds ~= response.completionKinds ~= CompletionKind.moduleName;
exists(buildPath(name, "package.d")) || exists(buildPath(name, "package.di")) }
? CompletionKind.moduleName : CompletionKind.packageName; else if (isDir(name))
{
if (n[0] != '.' && (partial is null || n.startsWith(partial)))
{
response.completions ~= n;
response.completionKinds ~=
exists(buildPath(name, "package.d")) || exists(buildPath(name, "package.di"))
? CompletionKind.moduleName : CompletionKind.packageName;
}
} }
} }
} }