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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2017-01-12 15:58:19 -08:00
parent 221190f9dc 99080b4939
commit c765d5e3a5
297 changed files with 4847 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/swift-ide-test/swift-ide-test.cpp
View File

@@ -2678,43 +2678,42 @@ namespace {
raw_ostream &OS;
bool firstSourceEntity = true;
void anchor() {}
void printSymbolKind(SymbolKind kind, SymbolSubKindSet subKinds) {
OS << getSymbolKindString(kind);
if (subKinds) {
void printSymbolInfo(SymbolInfo SymInfo) {
OS << getSymbolKindString(SymInfo.Kind);
if (SymInfo.SubKind != SymbolSubKind::None)
OS << '/' << getSymbolSubKindString(SymInfo.SubKind);
if (SymInfo.Properties) {
OS << '(';
printSymbolSubKinds(subKinds, OS);
printSymbolProperties(SymInfo.Properties, OS);
OS << ')';
}
// FIXME: add and use language enum
OS << '/' << "Swift";
OS << '/' << getSymbolLanguageString(SymInfo.Lang);
}
public:
PrintIndexDataConsumer(raw_ostream &OS) : OS(OS) {}
void failed(StringRef error) {}
void failed(StringRef error) override {}
bool recordHash(StringRef hash, bool isKnown) { return true; }
bool startDependency(SymbolKind kind, StringRef name, StringRef path,
bool isSystem, StringRef hash) {
OS << getSymbolKindString(kind) << " | ";
bool recordHash(StringRef hash, bool isKnown) override { return true; }
bool startDependency(StringRef name, StringRef path, bool isClangModule,
bool isSystem, StringRef hash) override {
OS << (isClangModule ? "clang-module" : "module") << " | ";
OS << (isSystem ? "system" : "user") << " | ";
OS << name << " | " << path << "-" << hash << "\n";
return true;
}
bool finishDependency(SymbolKind kind) {
bool finishDependency(bool isClangModule) override {
return true;
}
Action startSourceEntity(const IndexSymbol &symbol) {
Action startSourceEntity(const IndexSymbol &symbol) override {
if (firstSourceEntity) {
firstSourceEntity = false;
OS << "------------\n";
}
OS << symbol.line << ':' << symbol.column << " | ";
printSymbolKind(symbol.kind, symbol.subKinds);
printSymbolInfo(symbol.symInfo);
OS << " | " << symbol.name << " | " << symbol.USR << " | ";
clang::index::printSymbolRoles(symbol.roles, OS);
OS << " | rel: " << symbol.Relations.size() << "\n";
@@ -2726,12 +2725,11 @@ namespace {
}
return Continue;
}
bool finishSourceEntity(SymbolKind kind, SymbolSubKindSet subKinds,
SymbolRoleSet roles) {
bool finishSourceEntity(SymbolInfo symInfo, SymbolRoleSet roles) override {
return true;
}
void finish() {}
void finish() override {}
};
} // anonymous namespace