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

Fix issue with going to declaration of fully qualified symbols

This commit is contained in:
Hackerpilot 2014-01-29 15:39:24 -08:00
parent 8092bc957c
commit 7ccb6eb751
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autocomplete.d
View File

@ -128,13 +128,19 @@ AutocompleteResponse findDeclaration(const AutocompleteRequest request)
bool shouldSwapWithType(CompletionType completionType, CompletionKind kind, bool shouldSwapWithType(CompletionType completionType, CompletionKind kind,
size_t current, size_t max) pure nothrow @safe size_t current, size_t max) pure nothrow @safe
{ {
// Modules and packages never have types, so always return false
if (kind == CompletionKind.moduleName || kind == CompletionKind.packageName)
return false;
// Swap out every part of a chain with its type except the last part
if (current < max && completionType == CompletionType.location)
return true;
// Only swap out types for these kinds
immutable bool isInteresting = immutable bool isInteresting =
kind == CompletionKind.variableName kind == CompletionKind.variableName
|| kind == CompletionKind.memberVariableName || kind == CompletionKind.memberVariableName
|| kind == CompletionKind.enumMember || kind == CompletionKind.enumMember
|| kind == CompletionKind.functionName; || kind == CompletionKind.functionName;
return (current < max && completionType == CompletionType.location) return completionType == CompletionType.identifiers && isInteresting;
|| (completionType == CompletionType.identifiers && isInteresting);
} }
const(ACSymbol)*[] getSymbolsByTokenChain(T)(const(Scope)* completionScope, const(ACSymbol)*[] getSymbolsByTokenChain(T)(const(Scope)* completionScope,
@ -327,7 +333,7 @@ AutocompleteResponse complete(const AutocompleteRequest request)
beforeTokens = beforeTokens[0 .. $ - 1]; beforeTokens = beforeTokens[0 .. $ - 1];
goto dotCompletion; goto dotCompletion;
} }
if (beforeTokens.length >= 2 && beforeTokens[$ - 1] == tok!"(") else if (beforeTokens.length >= 2 && beforeTokens[$ - 1] == tok!"(")
{ {
immutable(string)[] completions; immutable(string)[] completions;
switch (beforeTokens[$ - 2].type) switch (beforeTokens[$ - 2].type)
@ -476,7 +482,7 @@ void setCompletions(T)(ref AutocompleteResponse response,
return; return;
} }
foreach (s; symbols[0].parts.filter!(a => a.name !is null foreach (s; symbols[0].parts.filter!(a => a.name !is null
&& a.name[0] != '*' && a.name.length > 0 && a.name[0] != '*'
&& (partial is null ? true : a.name.toUpper().startsWith(partial.toUpper())) && (partial is null ? true : a.name.toUpper().startsWith(partial.toUpper()))
&& !response.completions.canFind(a.name))) && !response.completions.canFind(a.name)))
{ {