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

Fix #100

This commit is contained in:
Hackerpilot 2014-01-30 20:23:05 -08:00
parent 803a3b336f
commit 5eb7a6c260
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autocomplete.d
View File

@ -73,6 +73,11 @@ AutocompleteResponse getDoc(const AutocompleteRequest request)
Log.error("Could not find symbol"); Log.error("Could not find symbol");
else foreach (symbol; symbols) else foreach (symbol; symbols)
{ {
if (symbol.doc is null)
{
Log.trace("Doc comment for ", symbol.name, " was null");
continue;
}
Log.trace("Adding doc comment for ", symbol.name, ": ", symbol.doc); Log.trace("Adding doc comment for ", symbol.name, ": ", symbol.doc);
response.docComments ~= symbol.doc; response.docComments ~= symbol.doc;
} }
@ -129,8 +134,16 @@ 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 // Modules and packages never have types, so always return false
if (kind == CompletionKind.moduleName || kind == CompletionKind.packageName) if (kind == CompletionKind.moduleName
|| kind == CompletionKind.packageName
|| kind == CompletionKind.className
|| kind == CompletionKind.structName
|| kind == CompletionKind.interfaceName
|| kind == CompletionKind.enumName
|| kind == CompletionKind.unionName)
{
return false; return false;
}
// Swap out every part of a chain with its type except the last part // Swap out every part of a chain with its type except the last part
if (current < max) if (current < max)
return true; return true;

2
dscanner

@ -1 +1 @@
Subproject commit b682648b27bd7fa8500d9110cbf91a65d68d71a4 Subproject commit 552d0bbb074445979675ab9784baf8119c6e1f3e