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

[SourceKit] Apply clang-format to the SourceKit plugin sources

Browse Source
This commit is contained in:
Alex Hoppen
2025-01-03 14:05:15 +01:00
parent b6c94aecc3
commit 6d0463ad82
19 changed files with 469 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/SourceKit/include/SourceKit/Core/Context.h
View File

@@ -51,7 +51,8 @@ private:
mutable llvm::sys::Mutex Mtx;
public:
Settings update(std::optional<unsigned> IDEInspectionMaxASTContextReuseCount,
Settings
update(std::optional<unsigned> IDEInspectionMaxASTContextReuseCount,
std::optional<unsigned> IDEInspectionCheckDependencyInterval);
Settings::IDEInspectionOptions getIDEInspectionOpts() const;
};

31
tools/SourceKit/tools/sourcekitd/bin/InProc/CodeCompletionSwiftInterop.cpp
View File

@@ -136,8 +136,8 @@ swiftide_connection_t swiftide_connection_create(void) {
return swiftide_connection_create_with_inspection_instance(nullptr);
}
swiftide_connection_t
swiftide_connection_create_with_inspection_instance(void *opaqueIDESwiftInspectionInstance) {
swiftide_connection_t swiftide_connection_create_with_inspection_instance(
void *opaqueIDESwiftInspectionInstance) {
static std::once_flag once;
std::call_once(
once, [] { llvm::sys::PrintStackTraceOnErrorSignal("IDESwiftInterop"); });
@@ -147,7 +147,6 @@ swiftide_connection_create_with_inspection_instance(void *opaqueIDESwiftInspecti
return static_cast<swiftide_connection_t>(new Connection(inspectInstance));
}
void swiftide_connection_dispose(swiftide_connection_t conn) {
assert(conn);
delete static_cast<Connection *>(conn);
@@ -190,7 +189,9 @@ struct CompletionResult {
bool hasError() const { return !error.empty(); }
ArrayRef<CodeCompletionResult *> getCompletions() { return resultSink.Results; }
ArrayRef<CodeCompletionResult *> getCompletions() {
return resultSink.Results;
}
};
struct SwiftInteropCodeCompletionConsumer : public ide::CodeCompletionConsumer {
@@ -214,7 +215,8 @@ struct CompletionRequest {
bool addInitsToTopLevel = false;
bool addCallWithNoDefaultArgs = true;
CompletionRequest(const char *path, unsigned offset, ArrayRef<const char *>args) {
CompletionRequest(const char *path, unsigned offset,
ArrayRef<const char *> args) {
this->path = StringRef(path).copy(allocator);
this->offset = offset;
compilerArguments.reserve(args.size());
@@ -234,12 +236,12 @@ void swiftide_cancel_request(swiftide_connection_t _conn,
}
swiftide_completion_request_t
swiftide_completion_request_create(const char *path,
uint32_t offset,
swiftide_completion_request_create(const char *path, uint32_t offset,
char *const *const compiler_args,
uint32_t num_compiler_args) {
return new CompletionRequest(path, offset, llvm::ArrayRef(compiler_args, num_compiler_args));
return new CompletionRequest(
path, offset, llvm::ArrayRef(compiler_args, num_compiler_args));
}
void swiftide_completion_request_dispose(swiftide_completion_request_t _req) {
@@ -368,7 +370,8 @@ void Connection::codeComplete(
std::string compilerInvocationError;
bool creatingInvocationFailed = initCompilerInvocation(
invocation, args, FrontendOptions::ActionType::Typecheck, diags, path, fileSystem, swiftExecutablePath, runtimeResourcePath,
invocation, args, FrontendOptions::ActionType::Typecheck, diags, path,
fileSystem, swiftExecutablePath, runtimeResourcePath,
diagnosticsDocumentationPath, sessionTimestamp, compilerInvocationError);
if (creatingInvocationFailed) {
callback(ResultType::failure(compilerInvocationError));
@@ -760,7 +763,8 @@ uint32_t swiftide_completion_item_get_flair(swiftide_completion_item_t _item) {
result |= SWIFTIDE_COMPLETION_FLAIR_RAREKEYWORDATCURRENTPOSITION;
if (flair.contains(CodeCompletionFlairBit::RareTypeAtCurrentPosition))
result |= SWIFTIDE_COMPLETION_FLAIR_RARETYPEATCURRENTPOSITION;
if (flair.contains(CodeCompletionFlairBit::ExpressionAtNonScriptOrMainFileScope))
if (flair.contains(
CodeCompletionFlairBit::ExpressionAtNonScriptOrMainFileScope))
result |= SWIFTIDE_COMPLETION_FLAIR_EXPRESSIONATNONSCRIPTORMAINFILESCOPE;
return result;
}
@@ -792,8 +796,7 @@ uint32_t swiftide_completion_item_not_recommended_reason(
}
}
bool swiftide_completion_item_has_diagnostic(
swiftide_completion_item_t _item) {
bool swiftide_completion_item_has_diagnostic(swiftide_completion_item_t _item) {
auto &item = *static_cast<CodeCompletionResult *>(_item);
return (item.getNotRecommendedReason() != NotRecommendedReason::None);
}
@@ -854,7 +857,9 @@ swiftide_completion_item_get_type_relation(swiftide_completion_item_t _item) {
item.getExpectedTypeRelation());
}
uint32_t swiftide_completion_item_import_depth(swiftide_completion_response_t _response, swiftide_completion_item_t _item) {
uint32_t
swiftide_completion_item_import_depth(swiftide_completion_response_t _response,
swiftide_completion_item_t _item) {
auto &response = *static_cast<CompletionResult *>(_response);
auto &item = *static_cast<CodeCompletionResult *>(_item);
if (item.getSemanticContext() == SemanticContextKind::OtherModule) {

107
tools/SourceKit/tools/sourcekitd/bin/InProc/CodeCompletionSwiftInterop.h
View File

@@ -23,22 +23,17 @@
#define SWIFTIDE_VERSION_MAJOR 0
#define SWIFTIDE_VERSION_MINOR 1
#define SWIFTIDE_VERSION_ENCODE(major, minor) ( \
((major) * 10000) \
+ ((minor) * 1))
#define SWIFTIDE_VERSION_ENCODE(major, minor) (((major)*10000) + ((minor)*1))
#define SWIFTIDE_VERSION SWIFTIDE_VERSION_ENCODE( \
SWIFTIDE_VERSION_MAJOR, \
SWIFTIDE_VERSION_MINOR )
#define SWIFTIDE_VERSION \
SWIFTIDE_VERSION_ENCODE(SWIFTIDE_VERSION_MAJOR, SWIFTIDE_VERSION_MINOR)
#define SWIFTIDE_VERSION_STRINGIZE_(major, minor) \
#major"."#minor
#define SWIFTIDE_VERSION_STRINGIZE_(major, minor) #major "." #minor
#define SWIFTIDE_VERSION_STRINGIZE(major, minor) \
SWIFTIDE_VERSION_STRINGIZE_(major, minor)
#define SWIFTIDE_VERSION_STRING SWIFTIDE_VERSION_STRINGIZE( \
SWIFTIDE_VERSION_MAJOR, \
SWIFTIDE_VERSION_MINOR)
#define SWIFTIDE_VERSION_STRING \
SWIFTIDE_VERSION_STRINGIZE(SWIFTIDE_VERSION_MAJOR, SWIFTIDE_VERSION_MINOR)
#ifdef __cplusplus
#define SWIFTIDE_BEGIN_DECLS extern "C" {
@@ -202,7 +197,8 @@ typedef enum {
SWIFTIDE_COMPLETION_NOT_RECOMMENDED_VARIABLE_USED_IN_OWN_DEFINITION = 5,
SWIFTIDE_COMPLETION_NOT_RECOMMENDED_REDUNDANT_IMPORT_INDIRECT = 6,
SWIFTIDE_COMPLETION_NOT_RECOMMENDED_SOFTDEPRECATED = 7,
SWIFTIDE_COMPLETION_NOT_RECOMMENDED_NON_ASYNC_ALTERNATIVE_USED_IN_ASYNC_CONTEXT = 8,
SWIFTIDE_COMPLETION_NOT_RECOMMENDED_NON_ASYNC_ALTERNATIVE_USED_IN_ASYNC_CONTEXT =
8,
} swiftide_completion_not_recommended_reason_t;
typedef enum {
@@ -226,15 +222,15 @@ typedef const void *swiftide_request_handle_t;
//=== Functions -----------------------------------------------------------===//
SWIFTIDE_DEPRECATED("Use swiftide_connection_create_with_inspection_instance instead")
SWIFTIDE_PUBLIC swiftide_connection_t
swiftide_connection_create(void);
SWIFTIDE_DEPRECATED(
"Use swiftide_connection_create_with_inspection_instance instead")
SWIFTIDE_PUBLIC swiftide_connection_t swiftide_connection_create(void);
SWIFTIDE_PUBLIC swiftide_connection_t
swiftide_connection_create_with_inspection_instance(void *opqueSwiftIDEInspectionInstance);
swiftide_connection_create_with_inspection_instance(
void *opqueSwiftIDEInspectionInstance);
SWIFTIDE_PUBLIC void
swiftide_connection_dispose(swiftide_connection_t);
SWIFTIDE_PUBLIC void swiftide_connection_dispose(swiftide_connection_t);
SWIFTIDE_PUBLIC void
swiftide_connection_mark_cached_compiler_instance_should_be_invalidated(
@@ -243,8 +239,7 @@ swiftide_connection_mark_cached_compiler_instance_should_be_invalidated(
/// Override the contents of the file \p path with \p contents. If \p contents
/// is NULL, go back to using the real the file system.
SWIFTIDE_PUBLIC void
swiftide_set_file_contents(swiftide_connection_t connection,
const char *path,
swiftide_set_file_contents(swiftide_connection_t connection, const char *path,
const char *contents);
/// Cancel the request with \p handle.
@@ -252,8 +247,7 @@ SWIFTIDE_PUBLIC void swiftide_cancel_request(swiftide_connection_t _conn,
swiftide_request_handle_t handle);
SWIFTIDE_PUBLIC swiftide_completion_request_t
swiftide_completion_request_create(const char *path,
uint32_t offset,
swiftide_completion_request_create(const char *path, uint32_t offset,
char *const *const compiler_args,
uint32_t num_compiler_args);
@@ -261,16 +255,18 @@ SWIFTIDE_PUBLIC void
swiftide_completion_request_dispose(swiftide_completion_request_t);
SWIFTIDE_PUBLIC void
swiftide_completion_request_set_annotate_result(swiftide_completion_request_t, bool);
swiftide_completion_request_set_annotate_result(swiftide_completion_request_t,
bool);
SWIFTIDE_PUBLIC void swiftide_completion_request_set_include_objectliterals(
swiftide_completion_request_t, bool);
SWIFTIDE_PUBLIC void swiftide_completion_request_set_add_inits_to_top_level(
swiftide_completion_request_t, bool);
SWIFTIDE_PUBLIC void
swiftide_completion_request_set_include_objectliterals(swiftide_completion_request_t, bool);
SWIFTIDE_PUBLIC void
swiftide_completion_request_set_add_inits_to_top_level(swiftide_completion_request_t, bool);
SWIFTIDE_PUBLIC void
swiftide_completion_request_set_add_call_with_no_default_args(swiftide_completion_request_t, bool);
swiftide_completion_request_set_add_call_with_no_default_args(
swiftide_completion_request_t, bool);
/// Same as swiftide_complete but supports cancellation.
/// This request is identified by \p handle. Calling swiftide_cancel_request
@@ -283,8 +279,8 @@ SWIFTIDE_PUBLIC swiftide_completion_response_t swiftide_complete_cancellable(
swiftide_request_handle_t handle);
SWIFTIDE_DEPRECATED("Use swiftide_complete_cancellable instead")
SWIFTIDE_PUBLIC swiftide_completion_response_t
swiftide_complete(swiftide_connection_t provider, swiftide_completion_request_t);
SWIFTIDE_PUBLIC swiftide_completion_response_t swiftide_complete(
swiftide_connection_t provider, swiftide_completion_request_t);
SWIFTIDE_PUBLIC void
swiftide_completion_result_dispose(swiftide_completion_response_t);
@@ -293,8 +289,8 @@ SWIFTIDE_PUBLIC bool
swiftide_completion_result_is_error(swiftide_completion_response_t);
/// Result has the same lifetime as the result.
SWIFTIDE_PUBLIC const char *
swiftide_completion_result_get_error_description(swiftide_completion_response_t);
SWIFTIDE_PUBLIC const char *swiftide_completion_result_get_error_description(
swiftide_completion_response_t);
SWIFTIDE_PUBLIC bool
swiftide_completion_result_is_cancelled(swiftide_completion_response_t);
@@ -304,10 +300,11 @@ swiftide_completion_result_is_cancelled(swiftide_completion_response_t);
SWIFTIDE_PUBLIC const char *
swiftide_completion_result_description_copy(swiftide_completion_response_t);
SWIFTIDE_PUBLIC void
swiftide_completion_result_get_completions(swiftide_completion_response_t,
SWIFTIDE_PUBLIC void swiftide_completion_result_get_completions(
swiftide_completion_response_t,
void (^completions_handler)(const swiftide_completion_item_t *completions,
const char **filter_names, uint64_t num_completions));
const char **filter_names,
uint64_t num_completions));
SWIFTIDE_PUBLIC swiftide_completion_item_t
swiftide_completion_result_get_completion_at_index(
@@ -319,8 +316,8 @@ swiftide_completion_result_get_kind(swiftide_completion_response_t);
SWIFTIDE_PUBLIC void swiftide_completion_result_foreach_baseexpr_typename(
swiftide_completion_response_t, bool (^handler)(const char *));
SWIFTIDE_PUBLIC bool
swiftide_completion_result_is_reusing_astcontext(swiftide_completion_response_t);
SWIFTIDE_PUBLIC bool swiftide_completion_result_is_reusing_astcontext(
swiftide_completion_response_t);
/// Copies a string representation of the completion item. This string should
/// be disposed of with \c free when done.
@@ -329,8 +326,7 @@ swiftide_completion_item_description_copy(swiftide_completion_item_t);
SWIFTIDE_PUBLIC void
swiftide_completion_item_get_label(swiftide_completion_response_t,
swiftide_completion_item_t,
bool annotate,
swiftide_completion_item_t, bool annotate,
void (^handler)(const char *));
SWIFTIDE_PUBLIC void
@@ -338,10 +334,8 @@ swiftide_completion_item_get_source_text(swiftide_completion_response_t,
swiftide_completion_item_t,
void (^handler)(const char *));
SWIFTIDE_PUBLIC void
swiftide_completion_item_get_type_name(swiftide_completion_response_t,
swiftide_completion_item_t,
bool annotate,
SWIFTIDE_PUBLIC void swiftide_completion_item_get_type_name(
swiftide_completion_response_t, swiftide_completion_item_t, bool annotate,
void (^handler)(const char *));
SWIFTIDE_PUBLIC void
@@ -349,13 +343,12 @@ swiftide_completion_item_get_doc_brief(swiftide_completion_response_t,
swiftide_completion_item_t,
void (^handler)(const char *));
SWIFTIDE_PUBLIC void
swiftide_completion_item_get_associated_usrs(swiftide_completion_response_t,
swiftide_completion_item_t,
SWIFTIDE_PUBLIC void swiftide_completion_item_get_associated_usrs(
swiftide_completion_response_t, swiftide_completion_item_t,
void (^handler)(const char **, uint64_t));
SWIFTIDE_PUBLIC uint32_t
swiftide_completion_item_get_kind(swiftide_completion_item_t);
SWIFTIDE_PUBLIC
uint32_t swiftide_completion_item_get_kind(swiftide_completion_item_t);
SWIFTIDE_PUBLIC uint32_t
swiftide_completion_item_get_associated_kind(swiftide_completion_item_t);
@@ -363,8 +356,8 @@ swiftide_completion_item_get_associated_kind(swiftide_completion_item_t);
SWIFTIDE_PUBLIC uint32_t
swiftide_completion_item_get_semantic_context(swiftide_completion_item_t);
SWIFTIDE_PUBLIC uint32_t
swiftide_completion_item_get_flair(swiftide_completion_item_t);
SWIFTIDE_PUBLIC
uint32_t swiftide_completion_item_get_flair(swiftide_completion_item_t);
SWIFTIDE_PUBLIC bool
swiftide_completion_item_is_not_recommended(swiftide_completion_item_t);
@@ -397,16 +390,14 @@ swiftide_completion_item_get_type_relation(swiftide_completion_item_t);
/// Returns 0 for items not in an external module, and ~0u if the other module
/// is not imported or the depth is otherwise unknown.
SWIFTIDE_PUBLIC uint32_t
swiftide_completion_item_import_depth(swiftide_completion_response_t, swiftide_completion_item_t);
SWIFTIDE_PUBLIC uint32_t swiftide_completion_item_import_depth(
swiftide_completion_response_t, swiftide_completion_item_t);
SWIFTIDE_PUBLIC swiftide_fuzzy_match_pattern_t
swiftide_fuzzy_match_pattern_create(const char *pattern);
SWIFTIDE_PUBLIC bool
swiftide_fuzzy_match_pattern_matches_candidate(
swiftide_fuzzy_match_pattern_t pattern,
const char *candidate,
SWIFTIDE_PUBLIC bool swiftide_fuzzy_match_pattern_matches_candidate(
swiftide_fuzzy_match_pattern_t pattern, const char *candidate,
double *outScore);
SWIFTIDE_PUBLIC void

1
tools/SourceKit/tools/sourcekitd/include/sourcekitd/CompactArray.h
View File

@@ -249,7 +249,6 @@ VariantFunctions CompactArrayFuncs<T>::Funcs = {
nullptr /*Annot_data_get_size*/,
nullptr /*Annot_data_get_ptr*/,
};
}
#endif

3
tools/SourceKit/tools/sourcekitd/include/sourcekitd/Internal.h
View File

@@ -13,9 +13,8 @@
#ifndef LLVM_SOURCEKITD_INTERNAL_H
#define LLVM_SOURCEKITD_INTERNAL_H
#include "sourcekitd/plugin.h"
#include "SourceKit/Support/CancellationToken.h"
#include "sourcekitd/plugin.h"
#include "sourcekitd/sourcekitd.h"
#include "llvm/ADT/STLExtras.h"
#include <functional>

4
tools/SourceKit/tools/sourcekitd/include/sourcekitd/RequestResponsePrinterBase.h
View File

@@ -89,9 +89,7 @@ public:
OS << Val;
}
void visitDouble(double Val) {
OS << Val;
}
void visitDouble(double Val) { OS << Val; }
void visitString(llvm::StringRef Str) {
OS << '\"';

7
tools/SourceKit/tools/sourcekitd/include/sourcekitd/plugin.h
View File

@@ -224,9 +224,10 @@ SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL void
sourcekitd_cancellable_request_handler_t);
/// Adds a function that will be called when a request is cancelled.
/// The cancellation handler is called even for cancelled requests that are handled by
/// sourcekitd itself and not the plugin. If the plugin doesn't know the request
/// handle to be cancelled, it should ignore the cancellation request.
/// The cancellation handler is called even for cancelled requests that are
/// handled by sourcekitd itself and not the plugin. If the plugin doesn't know
/// the request handle to be cancelled, it should ignore the cancellation
/// request.
SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL void
sourcekitd_plugin_initialize_register_cancellation_handler(
sourcekitd_plugin_initialize_params_t,

12
tools/SourceKit/tools/sourcekitd/include/sourcekitd/sourcekitd.h
View File

@@ -103,8 +103,7 @@ sourcekitd_register_plugin_path(const char *clientPlugin,
/// clients that cannot call 'sourcekitd_initialize()' should need to call this
/// directly. Also, all clients must register the same plugins in the same
/// order.
SOURCEKITD_PUBLIC void
sourcekitd_load_client_plugins(void);
SOURCEKITD_PUBLIC void sourcekitd_load_client_plugins(void);
/// Initializes structures needed across the rest of the sourcekitd API.
///
@@ -408,8 +407,7 @@ sourcekitd_variant_dictionary_get_bool(sourcekitd_variant_t dict,
/// The underlying \c double value for the specified key. 0.0 if the
/// value for the specified key is not a double value or if there is no
/// value for the specified key.
SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL SOURCEKITD_WARN_RESULT
double
SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL SOURCEKITD_WARN_RESULT double
sourcekitd_variant_dictionary_get_double(sourcekitd_variant_t dict,
sourcekitd_uid_t key);
@@ -484,8 +482,7 @@ SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
bool
sourcekitd_variant_array_get_bool(sourcekitd_variant_t array, size_t index);
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
double
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT double
sourcekitd_variant_array_get_double(sourcekitd_variant_t array, size_t index);
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
@@ -542,8 +539,7 @@ SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
bool
sourcekitd_variant_bool_get_value(sourcekitd_variant_t obj);
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
double
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT double
sourcekitd_variant_double_get_value(sourcekitd_variant_t obj);
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT

3
tools/SourceKit/tools/sourcekitd/lib/API/CodeCompletionResultsArray.cpp
View File

@@ -128,7 +128,8 @@ public:
do { \
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
sourcekitd_variant_t var = make##Ty##Variant(Field); \
if (!applier(key, var, context)) return false; \
if (!applier(key, var, context)) \
return false; \
} while (0)
APPLY(KeyKind, UID, Kind);

7
tools/SourceKit/tools/sourcekitd/lib/API/DeclarationsArray.cpp
View File

@@ -56,8 +56,7 @@ public:
Reader.readEntries(Index, Kind, Offset, Length, USR);
}
static bool
apply(sourcekitd_uid_t Kind, unsigned Offset, unsigned Length,
static bool apply(sourcekitd_uid_t Kind, unsigned Offset, unsigned Length,
const char *USR,
sourcekitd_variant_dictionary_applier_f_t applier,
void *context) {
@@ -131,8 +130,8 @@ struct CompactVariantFuncs<DeclarationsArray> {
return Fn(key, Kind, Offset, Length, USR);
}
static bool dictionary_apply(
sourcekitd_variant_t dict,
static bool
dictionary_apply(sourcekitd_variant_t dict,
sourcekitd_variant_dictionary_applier_f_t applier,
void *context) {
void *Buf = (void *)dict.data[1];

3
tools/SourceKit/tools/sourcekitd/lib/API/DocSupportAnnotationArray.cpp
View File

@@ -87,7 +87,8 @@ public:
do { \
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
sourcekitd_variant_t var = make##Ty##Variant(Field); \
if (!applier(key, var, context)) return false; \
if (!applier(key, var, context)) \
return false; \
} while (0)
APPLY(KeyKind, UID, Kind);

6
tools/SourceKit/tools/sourcekitd/lib/API/ExpressionTypeArray.cpp
View File

@@ -79,7 +79,8 @@ public:
do { \
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
sourcekitd_variant_t var = make##Ty##Variant(Field); \
if (!applier(key, var, context)) return false; \
if (!applier(key, var, context)) \
return false; \
} while (0)
#define APPLY_ARRAY(Kind, Key) \
@@ -88,7 +89,8 @@ public:
sourcekitd_variant_t var = { \
{(uintptr_t)getVariantFunctionsFor##Kind##Array(), (uintptr_t)buffer, \
index}}; \
if (!applier(key, var, context)) return false; \
if (!applier(key, var, context)) \
return false; \
} while (0)
APPLY(KeyExpressionOffset, Int, result.ExprOffset);

7
tools/SourceKit/tools/sourcekitd/lib/API/TokenAnnotationsArray.cpp
View File

@@ -81,9 +81,7 @@ public:
IsSystem = LengthAndIsSystem & 0x1;
}
static bool apply(sourcekitd_uid_t Kind,
unsigned Offset,
unsigned Length,
static bool apply(sourcekitd_uid_t Kind, unsigned Offset, unsigned Length,
bool IsSystem,
sourcekitd_variant_dictionary_applier_f_t applier,
void *context) {
@@ -92,7 +90,8 @@ public:
do { \
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
sourcekitd_variant_t var = make##Ty##Variant(Field); \
if (!applier(key, var, context)) return false; \
if (!applier(key, var, context)) \
return false; \
} while (0)
APPLY(KeyKind, UID, Kind);

7
tools/SourceKit/tools/sourcekitd/lib/API/VariableTypeArray.cpp
View File

@@ -62,9 +62,10 @@ public:
const char *readPrintedType(unsigned Offset) { return PrintedTypes + Offset; }
static bool dictionary_apply(
void *Buffer, size_t Index,
sourcekitd_variant_dictionary_applier_f_t Applier, void *Context) {
static bool
dictionary_apply(void *Buffer, size_t Index,
sourcekitd_variant_dictionary_applier_f_t Applier,
void *Context) {
VariableTypeReader Reader((char *)Buffer);
auto Result = Reader.getVariable(Index);
#define APPLY(K, Ty, Field) \

19
tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp
View File

@@ -69,7 +69,8 @@ namespace {
/// This a near-copy of llvm::function_ref, but that exposes its members
/// publicly so we can efficiently wrap the applier functions below.
template <typename Fn> class applier_function_ref;
template <typename Fn>
class applier_function_ref;
template <typename Ret, typename... Params>
class applier_function_ref<Ret(Params...)> {
@@ -126,8 +127,7 @@ public:
DictMap Dict;
DictMap &DictRef = Dict;
variant_dictionary_apply(
Obj,
[&](sourcekitd_uid_t key, sourcekitd_variant_t value) {
Obj, [&](sourcekitd_uid_t key, sourcekitd_variant_t value) {
DictRef.push_back({UIdentFromSKDUID(key), value});
return true;
});
@@ -148,7 +148,8 @@ public:
return static_cast<ImplClass*>(this)->visitBool(
sourcekitd_variant_bool_get_value(Obj));
case SOURCEKITD_VARIANT_TYPE_DOUBLE:
return static_cast<ImplClass*>(this)->visitDouble(sourcekitd_variant_double_get_value(Obj));
return static_cast<ImplClass *>(this)->visitDouble(
sourcekitd_variant_double_get_value(Obj));
case SOURCEKITD_VARIANT_TYPE_STRING: {
size_t Len = sourcekitd_variant_string_get_length(Obj);
const char *Ptr = sourcekitd_variant_string_get_ptr(Obj);
@@ -457,8 +458,7 @@ sourcekitd_variant_dictionary_get_bool(sourcekitd_variant_t dict,
sourcekitd_variant_dictionary_get_value(dict, key));
}
double
sourcekitd_variant_dictionary_get_double(sourcekitd_variant_t dict,
double sourcekitd_variant_dictionary_get_double(sourcekitd_variant_t dict,
sourcekitd_uid_t key) {
if (auto fn = VAR_FN(dict, dictionary_get_double))
return fn(dict, key);
@@ -559,8 +559,8 @@ sourcekitd_variant_array_get_bool(sourcekitd_variant_t array, size_t index) {
sourcekitd_variant_array_get_value(array, index));
}
double
sourcekitd_variant_array_get_double(sourcekitd_variant_t array, size_t index) {
double sourcekitd_variant_array_get_double(sourcekitd_variant_t array,
size_t index) {
if (auto fn = VAR_FN(array, array_get_double))
return fn(array, index);
@@ -640,8 +640,7 @@ sourcekitd_variant_bool_get_value(sourcekitd_variant_t obj) {
return obj.data[1];
}
double
sourcekitd_variant_double_get_value(sourcekitd_variant_t obj) {
double sourcekitd_variant_double_get_value(sourcekitd_variant_t obj) {
if (auto fn = VAR_FN(obj, double_get_value))
return fn(obj);

13
tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-InProc.cpp
View File

@@ -54,6 +54,7 @@ public:
CustomData,
Error,
};
private:
ObjectKind Kind;
protected:
@@ -246,13 +247,12 @@ public:
return SOURCEKITD_VARIANT_TYPE_DOUBLE;
}
double getDouble() const override {
return Storage;
}
double getDouble() const override { return Storage; }
static bool classof(const SKDObject *O) {
return O->getKind() == ObjectKind::Double;
}
private:
double Storage;
};
@@ -868,7 +868,8 @@ static bool SKDVar_array_get_bool(sourcekitd_variant_t array, size_t index) {
return SKD_OBJ(array)->get(index)->getBool();
}
static double SKDVar_array_get_double(sourcekitd_variant_t array, size_t index) {
static double SKDVar_array_get_double(sourcekitd_variant_t array,
size_t index) {
return SKD_OBJ(array)->get(index)->getDouble();
}
@@ -920,8 +921,8 @@ SKDVar_dictionary_get_bool(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
return false;
}
static double
SKDVar_dictionary_get_double(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
static double SKDVar_dictionary_get_double(sourcekitd_variant_t dict,
sourcekitd_uid_t key) {
if (auto Object = SKD_OBJ(dict)->get(key)) {
return Object->getDouble();
}

34
tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp
View File

@@ -677,7 +677,8 @@ VariantFunctions *getPluginVariantFunctions(size_t BufKind) {
size_t index = BufKind - (size_t)CustomBufferKind::CustomBufferKind_End;
if (index >= PluginVariantFunctions.size() ||
PluginVariantFunctions[index] == nullptr) {
llvm::report_fatal_error("unknown custom buffer kind; possible plugin loading failure");
llvm::report_fatal_error(
"unknown custom buffer kind; possible plugin loading failure");
}
return PluginVariantFunctions[index];
}
@@ -721,19 +722,18 @@ static sourcekitd_variant_type_t XPCVar_get_type(sourcekitd_variant_t var) {
case (size_t)CustomBufferKind::RawData:
return SOURCEKITD_VARIANT_TYPE_DATA;
default:
return getPluginVariantFunctions(BufKind)->get_type(variantFromXPCObject(obj));
return getPluginVariantFunctions(BufKind)->get_type(
variantFromXPCObject(obj));
}
}
llvm::report_fatal_error("sourcekitd object did not resolve to a known type");
}
static bool XPCVar_array_apply(
sourcekitd_variant_t array,
static bool XPCVar_array_apply(sourcekitd_variant_t array,
sourcekitd_variant_array_applier_f_t applier,
void *context) {
return xpc_array_apply(XPC_OBJ(array),
^(size_t index, xpc_object_t obj) {
return xpc_array_apply(XPC_OBJ(array), ^(size_t index, xpc_object_t obj) {
return applier(index, variantFromXPCObject(obj), context);
});
}
@@ -742,7 +742,8 @@ static bool XPCVar_array_get_bool(sourcekitd_variant_t array, size_t index) {
return xpc_array_get_bool(XPC_OBJ(array), index);
}
static double XPCVar_array_get_double(sourcekitd_variant_t array, size_t index) {
static double XPCVar_array_get_double(sourcekitd_variant_t array,
size_t index) {
return xpc_array_get_double(XPC_OBJ(array), index);
}
@@ -776,13 +777,14 @@ static double XPCVar_double_get_value(sourcekitd_variant_t obj) {
return xpc_double_get_value(XPC_OBJ(obj));
}
static bool XPCVar_dictionary_apply(
sourcekitd_variant_t dict,
static bool
XPCVar_dictionary_apply(sourcekitd_variant_t dict,
sourcekitd_variant_dictionary_applier_f_t applier,
void *context) {
return xpc_dictionary_apply(XPC_OBJ(dict),
^(const char *key, xpc_object_t obj) {
return applier(sourcekitd_uid_get_from_cstr(key),variantFromXPCObject(obj), context);
return xpc_dictionary_apply(
XPC_OBJ(dict), ^(const char *key, xpc_object_t obj) {
return applier(sourcekitd_uid_get_from_cstr(key),
variantFromXPCObject(obj), context);
});
}
@@ -791,8 +793,8 @@ XPCVar_dictionary_get_bool(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
return xpc_dictionary_get_bool(XPC_OBJ(dict), strFromUID(key));
}
static double
XPCVar_dictionary_get_double(sourcekitd_variant_t dict, sourcekitd_uid_t key) {
static double XPCVar_dictionary_get_double(sourcekitd_variant_t dict,
sourcekitd_uid_t key) {
return xpc_dictionary_get_double(XPC_OBJ(dict), strFromUID(key));
}
@@ -842,7 +844,6 @@ static sourcekitd_uid_t XPCVar_uid_get_value(sourcekitd_variant_t obj) {
return sourcekitd_uid_t(xpc_uint64_get_value(XPC_OBJ(obj)));
}
static VariantFunctions XPCVariantFuncs = {
XPCVar_get_type,
XPCVar_array_apply,
@@ -986,7 +987,8 @@ void sourcekitd_response_dictionary_set_bool(sourcekitd_response_t dict,
}
void sourcekitd_response_dictionary_set_double(sourcekitd_response_t dict,
sourcekitd_uid_t key, double val) {
sourcekitd_uid_t key,
double val) {
xpc_dictionary_set_double(dict, strFromUID(key), val);
}