averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code completion: completion of type-ident in type contexts (like Foo.#^A^#)

Browse Source 
This introduces the required code completion callbacks which pass partially
parsed TypeReprs to code completion.  These types can refer to generic function
parameters.  Because we need to typecheck these types, we need to typecheck
generic parameters first.  Because exposing fine-grained typechecker interface
just for code completion is bad, we create a function declaration based on the
limited information we have (i.e., just the function name and generic
parameters) and pass that to the typechecker.  This approach (in theory) should
work uniformly for function decls and nominal type decls, but the nominal type
decl case is not tested yet.  Eventually we will also want to use a similar
approach for normal parser recovery as well.


Swift SVN r7313
This commit is contained in:
Dmitri Hrybenko
2013-08-17 02:35:32 +00:00
parent ff3143a370
commit cdb1df51a3
6 changed files with 144 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Parse/ParseDecl.cpp
View File

@@ -661,8 +661,8 @@ void Parser::parseDeclDelayed() {
Scope S(this, DelayedState->takeScope());
ContextChange CC(*this, DelayedState->ParentContext);
SmallVector<ExprStmtOrDecl, 4> Entries;
parseBraceItems(Entries, true, BraceItemListKind::TopLevelCode);
SmallVector<Decl *, 2> Entries;
parseDecl(Entries, DelayedState->Flags);
}
/// Parse an 'import' declaration, returning true (and doing no token skipping)
@@ -1456,12 +1456,31 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, unsigned Flags) {
}
TypeRepr *FuncRetTy;
{
CodeCompletionCallbacks::FunctionSignatureGenericParams CCInfo(
CodeCompletion, GenericParams);
if (parseFunctionSignature(ArgParams, BodyParams, FuncRetTy))
return 0;
if (parseFunctionSignature(ArgParams, BodyParams, FuncRetTy)) {
if (CodeCompletion) {
// Create fake function signature.
ArgParams.clear();
BodyParams.clear();
if (HasContainerType) {
Pattern *thisPattern = buildImplicitThisParameter();
ArgParams.push_back(thisPattern);
BodyParams.push_back(thisPattern);
}
ArgParams.push_back(new (Context) AnyPattern(SourceLoc()));
BodyParams.push_back(new (Context) AnyPattern(SourceLoc()));
FuncRetTy = TupleTypeRepr::create(Context, {}, SourceRange(),
SourceLoc());
// Create function AST nodes.
FuncExpr *FE =
actOnFuncExprStart(FuncLoc, FuncRetTy, ArgParams, BodyParams);
FuncDecl *FD = new (Context) FuncDecl(StaticLoc, FuncLoc, Name, NameLoc,
GenericParams, Type(), FE,
CurDeclContext);
FE->setDecl(FD);
FE->setBodySkipped(Tok.getLoc());
CodeCompletion->setDelayedParsedDecl(FD);
}
return nullptr;
}
// Enter the arguments for the function into a new function-body scope. We