From 5eb7a6c2604cec950d4575c8a07b16416c053e30 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 30 Jan 2014 20:23:05 -0800
Subject: [PATCH] Fix #100

---
 autocomplete.d | 15 ++++++++++++++-
 dscanner       |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/autocomplete.d b/autocomplete.d
index fe0ee94..16d008b 100644
--- a/autocomplete.d
+++ b/autocomplete.d
@@ -73,6 +73,11 @@ AutocompleteResponse getDoc(const AutocompleteRequest request)
 		Log.error("Could not find symbol");
 	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);
 		response.docComments ~= symbol.doc;
 	}
@@ -129,8 +134,16 @@ bool shouldSwapWithType(CompletionType completionType, CompletionKind kind,
 	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)
+	if (kind == CompletionKind.moduleName
+		|| kind == CompletionKind.packageName
+		|| kind == CompletionKind.className
+		|| kind == CompletionKind.structName
+		|| kind == CompletionKind.interfaceName
+		|| kind == CompletionKind.enumName
+		|| kind == CompletionKind.unionName)
+	{
 		return false;
+	}
 	// Swap out every part of a chain with its type except the last part
 	if (current < max)
 		return true;
diff --git a/dscanner b/dscanner
index b682648..552d0bb 160000
--- a/dscanner
+++ b/dscanner
@@ -1 +1 @@
-Subproject commit b682648b27bd7fa8500d9110cbf91a65d68d71a4
+Subproject commit 552d0bbb074445979675ab9784baf8119c6e1f3e