More import fixes

src/autocomplete.d

@@ -393,15 +393,28 @@ body
 	import containers.hashset;
 	HashSet!string h;
 	foreach (s; symbols.parts[])
+	{
+		if (s.kind == CompletionKind.importSymbol) foreach (sy; s.type.parts[])
+		{
+			auto a = ACSymbol(sy.name);
+			if (!builtinSymbols.contains(&a) && sy.name !is null && !h.contains(sy.name))
+			{
+				response.completionKinds ~= sy.kind;
+				response.completions ~= sy.name;
+				h.insert(sy.name);
+			}
+		}
+		else
 		{
 			auto a = ACSymbol(s.name);
-		if (!builtinSymbols.contains(&a) && !h.contains(s.name))
+			if (!builtinSymbols.contains(&a) && s.name !is null && !h.contains(s.name))
 			{
 				response.completionKinds ~= s.kind;
 				response.completions ~= s.name;
 				h.insert(s.name);
 			}
 		}
+	}
 	response.completionType = CompletionType.identifiers;
 	return response;
 }

src/conversion/second.d

@@ -37,6 +37,11 @@ struct SecondPass
 {
 public:
 
+	/**
+	 * Construct this with the results of the first pass
+	 * Params:
+	 *     first = the first pass
+	 */
 	this(FirstPass first)
 	{
 		this.rootSymbol = first.rootSymbol;
@@ -44,6 +49,9 @@ public:
 		this.symbolAllocator = first.symbolAllocator;
 	}
 
+	/**
+	 * Runs the second pass on the module.
+	 */
 	void run()
 	{
 		rootSymbol.acSymbol.parts.insert(builtinSymbols[]);
@@ -51,12 +59,26 @@ public:
 		resolveImports(moduleScope);
 	}
 
+	/**
+	 * Allocator used for allocating autocomplete symbols.
+	 */
 	CAllocator symbolAllocator;
+
+	/**
+	 * The root symbol from the first pass
+	 */
 	SemanticSymbol* rootSymbol;
+
+	/**
+	 * The module scope from the first pass
+	 */
 	Scope* moduleScope;
 
 private:
 
+	/**
+	 * Assigns symbols to scopes based on their location.
+	 */
 	void assignToScopes(ACSymbol* currentSymbol)
 	{
 		Scope* s = moduleScope.getScopeByCursor(currentSymbol.location);
@@ -71,12 +93,19 @@ private:
 
 	/**
 	 * Creates package symbols as necessary to contain the given module symbol
+	 * Params:
+	 *     info = the import information for the module being imported
+	 *     currentScope = the scope in which the import statement is located
+	 *     moduleSymbol = the module being imported
+	 * Returns: A package symbol that can be used for auto-completing qualified
+	 * symbol names.
 	 */
 	ACSymbol* createImportSymbols(ImportInformation* info, Scope* currentScope,
 		ACSymbol* moduleSymbol)
 	in
 	{
 		assert (info !is null);
+		assert (currentScope !is null);
 		assert (moduleSymbol !is null);
 	}
 	body
@@ -89,7 +118,6 @@ private:
 		else
 			firstSymbol = allocate!ACSymbol(symbolAllocator, firstPart,
 				CompletionKind.packageName);
-		currentScope.symbols.insert(firstSymbol);
 		ACSymbol* currentSymbol = firstSymbol;
 		size_t i = 0;
 		foreach (string importPart; info.importParts[])
@@ -99,9 +127,17 @@ private:
 			if (i + 2 >= info.importParts.length) // Skip the last item as it's the module name
 				break;
 			symbols = currentSymbol.getPartsByName(importPart);
-			ACSymbol* s = symbols.length > 0
-				? cast(ACSymbol*) symbols[0] : allocate!ACSymbol(symbolAllocator,
-					importPart, CompletionKind.packageName);
+			ACSymbol* s = null;
+			if (symbols.length > 0) foreach (sy; symbols)
+			{
+				if (sy.kind == CompletionKind.packageName)
+				{
+					s = sy;
+					break;
+				}
+			}
+			if (s is null)
+				s = allocate!ACSymbol(symbolAllocator, importPart, CompletionKind.packageName);
 			currentSymbol.parts.insert(s);
 			currentSymbol = s;
 		}
@@ -120,22 +156,34 @@ private:
 			if (symbol is null)
 				continue;
 			ACSymbol* moduleSymbol = createImportSymbols(importInfo, currentScope, symbol);
-			currentScope.symbols.insert(symbol.parts[]);
 			if (importInfo.importedSymbols.length == 0)
 			{
 				if (importInfo.isPublic && currentScope.parent is null)
-				{
 					rootSymbol.acSymbol.parts.insert(allocate!ACSymbol(symbolAllocator,
 						IMPORT_SYMBOL_NAME, CompletionKind.importSymbol, symbol));
-				}
+				else
+					currentScope.symbols.insert(symbol.parts[]);
 				continue;
 			}
-			symbolLoop: foreach (sym; symbol.parts[])
-			{
+
 			foreach (tup; importInfo.importedSymbols[])
 			{
-					if (tup[0] != symbol.name)
-						continue symbolLoop;
+				ACSymbol needle = ACSymbol(tup[0]);
+				ACSymbol* sym;
+				auto r = symbol.parts.equalRange(&needle);
+				if (r.empty) foreach (sy; symbol.parts[])
+				{
+					if (sy.kind != CompletionKind.importSymbol || sy.type is null)
+						continue;
+					auto ra = sy.type.parts.equalRange(&needle);
+					if (ra.empty)
+						continue;
+					sym = ra.front;
+				}
+				else
+					sym = r.front;
+				if (sym is null)
+					continue;
 				if (tup[1] !is null)
 				{
 					ACSymbol* s = allocate!ACSymbol(symbolAllocator, tup[1],
@@ -146,21 +194,14 @@ private:
 					s.qualifier = sym.qualifier;
 					s.location = sym.location;
 					s.symbolFile = sym.symbolFile;
-						currentScope.symbols.insert(s);
-						moduleSymbol.parts.insert(s);
-						if (importInfo.isPublic && currentScope.parent is null)
-							rootSymbol.acSymbol.parts.insert(s);
+					sym = s;
 				}
-					else
-					{
 				moduleSymbol.parts.insert(sym);
 				currentScope.symbols.insert(sym);
 				if (importInfo.isPublic && currentScope.parent is null)
 					rootSymbol.acSymbol.parts.insert(sym);
 			}
 		}
-			}
-		}
 		foreach (childScope; currentScope.children)
 			resolveImports(childScope);
 	}

src/modulecache.d

@@ -95,6 +95,7 @@ static this()
  */
 struct ModuleCache
 {
+	/// No copying.
 	@disable this();
 
 	/**
@@ -219,7 +220,7 @@ struct ModuleCache
 		{
 			string dotDi = buildPath(path, moduleName) ~ ".di";
 			string dotD = dotDi[0 .. $ - 1];
-			string withoutSuffix = dotDi[0 .. $ - 2];
+			string withoutSuffix = dotDi[0 .. $ - 3];
 			if (exists(dotD) && isFile(dotD))
 				alternatives = (dotD) ~ alternatives;
 			else if (exists(dotDi) && isFile(dotDi))
@@ -244,6 +245,7 @@ struct ModuleCache
 		return importPaths[];
 	}
 
+	/// Count of autocomplete symbols that have been allocated
 	static uint symbolsAllocated;
 
 private:

src/server.d

@@ -99,10 +99,9 @@ int main(string[] args)
 	scope(exit) Mallocator.it.deallocate(buffer);
 
 	sw.stop();
-	Log.info("Startup completed in ", sw.peek().to!("msecs", float), " milliseconds");
-//	float symbolMegs = (cast(float) (ACSymbol.sizeof * ModuleCache.symbolsAllocated)) / (1024f * 1024f);
-//	Log.info(ModuleCache.symbolsAllocated, " symbols allocated, taking up ",
-//		symbolMegs, " megabytes");
+	Log.info(ModuleCache.symbolsAllocated, " symbols cached.");
+	Log.info("Startup completed in ", sw.peek().to!("msecs", float), " milliseconds.");
+
 
 	// No relative paths
 	version (Posix) chdir("/");