Code completion: use a helper function to add type annotations -- it does getString() for us

Swift SVN r8989
This commit is contained in:
Dmitri Hrybenko
2013-10-07 21:09:05 +00:00
parent fdd08a42e4
commit fcdf862611

View File

@@ -774,11 +774,10 @@ public:
Builder.addTextChunk(TAD->getName().str());
if (TAD->hasUnderlyingType())
addTypeAnnotation(Builder,
MetaTypeType::get(TAD->getUnderlyingType(),
TU.Ctx));
MetaTypeType::get(TAD->getUnderlyingType(), TU.Ctx));
else {
Builder.addTypeAnnotation(MetaTypeType::get(TAD->getDeclaredType(),
TU.Ctx)->getString());
addTypeAnnotation(Builder,
MetaTypeType::get(TAD->getDeclaredType(), TU.Ctx));
}
}
@@ -790,8 +789,8 @@ public:
if (needDot())
Builder.addLeadingDot();
Builder.addTextChunk(GP->getName().str());
Builder.addTypeAnnotation(MetaTypeType::get(GP->getDeclaredType(),
TU.Ctx)->getString());
addTypeAnnotation(Builder,
MetaTypeType::get(GP->getDeclaredType(), TU.Ctx));
}
void addAssociatedTypeRef(const AssociatedTypeDecl *AT) {
@@ -802,8 +801,8 @@ public:
if (needDot())
Builder.addLeadingDot();
Builder.addTextChunk(AT->getName().str());
Builder.addTypeAnnotation(MetaTypeType::get(AT->getDeclaredType(),
TU.Ctx)->getString());
addTypeAnnotation(Builder,
MetaTypeType::get(AT->getDeclaredType(), TU.Ctx));
}
void addKeyword(StringRef Name, Type TypeAnnotation) {