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

Fix #102

This commit is contained in:
Hackerpilot 2014-01-31 00:12:25 -08:00
parent 5eb7a6c260
commit 5077cd49d3
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
astconverter.d
View File

@ -542,39 +542,43 @@ private:
assignToScopes(part); assignToScopes(part);
} }
// This method is really ugly due to the casts...
static ACSymbol* createImportSymbols(ImportInformation info,
Scope* currentScope)
{
immutable string firstPart = info.importParts[0];
const(ACSymbol)*[] symbols = currentScope.getSymbolsByName(firstPart);
immutable bool found = symbols.length > 0;
const(ACSymbol)* firstSymbol = found
? symbols[0] : new ACSymbol(firstPart, CompletionKind.packageName);
if (!found)
currentScope.symbols ~= firstSymbol;
ACSymbol* currentSymbol = cast(ACSymbol*) firstSymbol;
foreach (size_t i, string importPart; info.importParts[1 .. $])
{
symbols = currentSymbol.getPartsByName(importPart);
ACSymbol* s = symbols.length > 0
? cast(ACSymbol*) symbols[0] : new ACSymbol(importPart, CompletionKind.packageName);
currentSymbol.parts ~= s;
currentSymbol = s;
}
currentSymbol.kind = CompletionKind.moduleName;
return currentSymbol;
}
void resolveImports(Scope* currentScope) void resolveImports(Scope* currentScope)
{ {
foreach (importInfo; currentScope.importInformation) foreach (importInfo; currentScope.importInformation)
{ {
auto symbols = ModuleCache.getSymbolsInModule( auto symbols = ModuleCache.getSymbolsInModule(
ModuleCache.resolveImportLoctation(importInfo.modulePath)); ModuleCache.resolveImportLoctation(importInfo.modulePath));
ACSymbol* moduleSymbol = createImportSymbols(importInfo, currentScope);
currentScope.symbols ~= moduleSymbol;
currentScope.symbols ~= symbols;
if (importInfo.importedSymbols.length == 0) if (importInfo.importedSymbols.length == 0)
{ {
currentScope.symbols ~= symbols; currentScope.symbols ~= symbols;
ACSymbol* a; moduleSymbol.parts ~= symbols;
ACSymbol* b;
foreach (i, s; importInfo.importParts)
{
immutable kind = i + 1 < importInfo.importParts.length
? CompletionKind.packageName : CompletionKind.moduleName;
// Begin compiler bug workaround
if (kind == 'L')
std.stdio.writeln("ERROR ", kind);
// End compiler bug workaround
ACSymbol* modPart = new ACSymbol(s, kind);
if (a is null)
{
a = modPart;
b = a;
}
else
{
b.parts ~= modPart;
b = modPart;
}
}
b.parts ~= symbols;
currentScope.symbols ~= a;
if (importInfo.isPublic && currentScope.parent is null) if (importInfo.isPublic && currentScope.parent is null)
{ {
rootSymbol.acSymbol.parts ~= symbols; rootSymbol.acSymbol.parts ~= symbols;
@ -600,11 +604,13 @@ private:
s.location = symbol.location; s.location = symbol.location;
s.symbolFile = symbol.symbolFile; s.symbolFile = symbol.symbolFile;
currentScope.symbols ~= s; currentScope.symbols ~= s;
moduleSymbol.parts ~= s;
if (importInfo.isPublic && currentScope.parent is null) if (importInfo.isPublic && currentScope.parent is null)
rootSymbol.acSymbol.parts ~= s; rootSymbol.acSymbol.parts ~= s;
} }
else else
{ {
moduleSymbol.parts ~= symbol;
currentScope.symbols ~= symbol; currentScope.symbols ~= symbol;
if (importInfo.isPublic && currentScope.parent is null) if (importInfo.isPublic && currentScope.parent is null)
rootSymbol.acSymbol.parts ~= symbol; rootSymbol.acSymbol.parts ~= symbol;

2
autocomplete.d
View File

@ -107,7 +107,7 @@ AutocompleteResponse findDeclaration(const AutocompleteRequest request)
auto beforeTokens = sortedTokens.lowerBound(cast(size_t) request.cursorPosition); auto beforeTokens = sortedTokens.lowerBound(cast(size_t) request.cursorPosition);
Log.trace("Token at cursor: ", beforeTokens[$ - 1]); Log.trace("Token at cursor: ", beforeTokens[$ - 1].text);
const(Scope)* completionScope = generateAutocompleteTrees(tokenArray, "stdin"); const(Scope)* completionScope = generateAutocompleteTrees(tokenArray, "stdin");
auto expression = getExpression(beforeTokens); auto expression = getExpression(beforeTokens);