Skip to content

[SourceKit] Move some functions into sourcekitdAPI-Common. #3096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2016
Merged

[SourceKit] Move some functions into sourcekitdAPI-Common. #3096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,47 @@ sourcekitd_response_description_copy(sourcekitd_response_t resp) {
return strdup(Desc.c_str());
}


sourcekitd_uid_t
sourcekitd_uid_get_from_cstr(const char *string) {
return SKDUIDFromUIdent(UIdent(string));
}

sourcekitd_uid_t
sourcekitd_uid_get_from_buf(const char *buf, size_t length) {
return SKDUIDFromUIdent(UIdent(llvm::StringRef(buf, length)));
}

size_t
sourcekitd_uid_get_length(sourcekitd_uid_t uid) {
UIdent UID = UIdentFromSKDUID(uid);
return UID.getName().size();
}

const char *
sourcekitd_uid_get_string_ptr(sourcekitd_uid_t uid) {
UIdent UID = UIdentFromSKDUID(uid);
return UID.getName().begin();
}

void
sourcekitd_request_description_dump(sourcekitd_object_t obj) {
// Avoid colors here, we don't properly detect that the debug window inside
// Xcode doesn't support colors.
llvm::SmallString<128> Desc;
llvm::raw_svector_ostream OS(Desc);
printRequestObject(obj, OS);
llvm::errs() << OS.str() << '\n';
}

char *
sourcekitd_request_description_copy(sourcekitd_object_t obj) {
llvm::SmallString<128> Desc;
llvm::raw_svector_ostream OS(Desc);
printRequestObject(obj, OS);
return strdup(Desc.c_str());
}

//===----------------------------------------------------------------------===//
// Variant API
//===----------------------------------------------------------------------===//
Expand Down
44 changes: 0 additions & 44 deletions tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,32 +416,6 @@ sourcekitd::createErrorRequestCancelled() {
return CustomXPCData::createErrorRequestCancelled("").getXObj();
}

//===----------------------------------------------------------------------===//
// Public API
//===----------------------------------------------------------------------===//

sourcekitd_uid_t
sourcekitd_uid_get_from_cstr(const char *string) {
return SKDUIDFromUIdent(UIdent(string));
}

sourcekitd_uid_t
sourcekitd_uid_get_from_buf(const char *buf, size_t length) {
return SKDUIDFromUIdent(UIdent(llvm::StringRef(buf, length)));
}

size_t
sourcekitd_uid_get_length(sourcekitd_uid_t uid) {
UIdent UID = UIdentFromSKDUID(uid);
return UID.getName().size();
}

const char *
sourcekitd_uid_get_string_ptr(sourcekitd_uid_t uid) {
UIdent UID = UIdentFromSKDUID(uid);
return UID.getName().begin();
}

//===----------------------------------------------------------------------===//
// Public Request API
//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -558,24 +532,6 @@ sourcekitd_request_uid_create(sourcekitd_uid_t uid) {
return xpc_uint64_create(uintptr_t(uid));
}

void
sourcekitd_request_description_dump(sourcekitd_object_t obj) {
// Avoid colors here, we don't properly detect that the debug window inside
// Xcode doesn't support colors.
llvm::SmallString<128> Desc;
llvm::raw_svector_ostream OS(Desc);
printRequestObject(obj, OS);
llvm::errs() << OS.str() << '\n';
}

char *
sourcekitd_request_description_copy(sourcekitd_object_t obj) {
llvm::SmallString<128> Desc;
llvm::raw_svector_ostream OS(Desc);
printRequestObject(obj, OS);
return strdup(Desc.c_str());
}

//===----------------------------------------------------------------------===//
// Public Response API
//===----------------------------------------------------------------------===//
Expand Down