Somehow #88 popped up again. This fixes it.

This commit is contained in:
Hackerpilot 2014-03-04 23:43:42 -08:00
parent 7ef92d2438
commit 377d0021f0
1 changed files with 3 additions and 2 deletions

View File

@ -64,7 +64,7 @@ private:
// This method is really ugly due to the casts... // This method is really ugly due to the casts...
static ACSymbol* createImportSymbols(ImportInformation info, static ACSymbol* createImportSymbols(ImportInformation info,
Scope* currentScope) Scope* currentScope, ACSymbol*[] moduleSymbols)
{ {
immutable string firstPart = info.importParts[0]; immutable string firstPart = info.importParts[0];
ACSymbol*[] symbols = currentScope.getSymbolsByName(firstPart); ACSymbol*[] symbols = currentScope.getSymbolsByName(firstPart);
@ -85,6 +85,7 @@ private:
currentSymbol = s; currentSymbol = s;
} }
currentSymbol.kind = CompletionKind.moduleName; currentSymbol.kind = CompletionKind.moduleName;
currentSymbol.parts.insert(moduleSymbols);
return currentSymbol; return currentSymbol;
} }
@ -95,7 +96,7 @@ private:
{ {
string location = ModuleCache.resolveImportLoctation(importInfo.modulePath); string location = ModuleCache.resolveImportLoctation(importInfo.modulePath);
ACSymbol*[] symbols = location is null ? [] : ModuleCache.getSymbolsInModule(location); ACSymbol*[] symbols = location is null ? [] : ModuleCache.getSymbolsInModule(location);
ACSymbol* moduleSymbol = createImportSymbols(importInfo, currentScope); ACSymbol* moduleSymbol = createImportSymbols(importInfo, currentScope, symbols);
currentScope.symbols.insert(moduleSymbol); currentScope.symbols.insert(moduleSymbol);
currentScope.symbols.insert(symbols); currentScope.symbols.insert(symbols);
if (importInfo.importedSymbols.length == 0) if (importInfo.importedSymbols.length == 0)