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

[IDE] Fix the 'preamble' top-comment printing when printing the swift source interface.

Browse Source 
It erroneously printed out accessibility keyword of the first decl and did not take into
account comment whitespacing.

Swift SVN r30933
This commit is contained in:
Argyrios Kyrtzidis
2015-08-02 20:46:38 +00:00
parent 3485a97cd4
commit 0bb52f0621
7 changed files with 124 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -418,39 +418,49 @@ void swift::ide::printSubmoduleInterface(
}
static SourceLoc getDeclStartPosition(SourceFile &File) {
llvm::Optional<SourceLoc> Winner;
SourceManager &SM = File.getASTContext().SourceMgr;
for (auto D : File.Decls) {
auto Start = !D->getRawComment().isEmpty() &&
SM.isBeforeInBuffer(D->getRawComment().Comments[0].Range.getStart(),
D->getSourceRange().Start) ?
D->getRawComment().Comments[0].Range.getStart() :
D->getSourceRange().Start;
SourceLoc Winner;
if (Winner.hasValue()) {
if (SM.isBeforeInBuffer(Start, Winner.getValue())) {
Winner = Start;
}
} else {
Winner = Start;
auto tryUpdateStart = [&](SourceLoc Loc) -> bool {
if (Loc.isInvalid())
return false;
if (Winner.isInvalid()) {
Winner = Loc;
return true;
}
if (SM.isBeforeInBuffer(Loc, Winner)) {
Winner = Loc;
return true;
}
return false;
};
for (auto D : File.Decls) {
if (tryUpdateStart(D->getStartLoc())) {
tryUpdateStart(D->getAttrs().getStartLoc());
auto RawComment = D->getRawComment();
if (!RawComment.isEmpty())
tryUpdateStart(RawComment.Comments.front().Range.getStart());
}
}
return Winner.hasValue() ? Winner.getValue() : SourceLoc();
return Winner;
}
static void printUntilFirstDeclStarts(SourceFile &File, ASTPrinter &Printer) {
if (!File.getBufferID().hasValue())
return;
auto DeclStartLoc = getDeclStartPosition(File);
auto &SM = File.getASTContext().SourceMgr;
auto Tokens = swift::tokenize(File.getASTContext().LangOpts, SM,
File.getBufferID().getValue());
auto BufferID = *File.getBufferID();
for (auto It = Tokens.begin(); It < Tokens.end() &&
(DeclStartLoc.isInvalid() || SM.isBeforeInBuffer(It->getLoc(),
DeclStartLoc)); ++ It) {
Printer << It->getText();
auto &SM = File.getASTContext().SourceMgr;
CharSourceRange TextRange = SM.getRangeForBuffer(BufferID);
auto DeclStartLoc = getDeclStartPosition(File);
if (DeclStartLoc.isValid()) {
TextRange = CharSourceRange(SM, TextRange.getStart(), DeclStartLoc);
}
Printer << SM.extractText(TextRange, BufferID);
}
void swift::ide::printSwiftSourceInterface(SourceFile &File,