Skip to content

Commit 6d0463a

Browse files
committed
[SourceKit] Apply clang-format to the SourceKit plugin sources
1 parent b6c94ae commit 6d0463a

19 files changed

+474
-479
lines changed

tools/SourceKit/include/SourceKit/Core/Context.h

+22-21
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,28 @@ namespace SourceKit {
3333
class NotificationCenter;
3434
class PluginSupport;
3535

36-
class GlobalConfig {
37-
public:
38-
struct Settings {
39-
struct IDEInspectionOptions {
40-
41-
/// Max count of reusing ASTContext for cached IDE inspection.
42-
unsigned MaxASTContextReuseCount = 100;
43-
44-
/// Interval second for checking dependencies in cached IDE inspection.
45-
unsigned CheckDependencyInterval = 5;
46-
} IDEInspectionOpts;
47-
};
48-
49-
private:
50-
Settings State;
51-
mutable llvm::sys::Mutex Mtx;
52-
53-
public:
54-
Settings update(std::optional<unsigned> IDEInspectionMaxASTContextReuseCount,
55-
std::optional<unsigned> IDEInspectionCheckDependencyInterval);
56-
Settings::IDEInspectionOptions getIDEInspectionOpts() const;
36+
class GlobalConfig {
37+
public:
38+
struct Settings {
39+
struct IDEInspectionOptions {
40+
41+
/// Max count of reusing ASTContext for cached IDE inspection.
42+
unsigned MaxASTContextReuseCount = 100;
43+
44+
/// Interval second for checking dependencies in cached IDE inspection.
45+
unsigned CheckDependencyInterval = 5;
46+
} IDEInspectionOpts;
47+
};
48+
49+
private:
50+
Settings State;
51+
mutable llvm::sys::Mutex Mtx;
52+
53+
public:
54+
Settings
55+
update(std::optional<unsigned> IDEInspectionMaxASTContextReuseCount,
56+
std::optional<unsigned> IDEInspectionCheckDependencyInterval);
57+
Settings::IDEInspectionOptions getIDEInspectionOpts() const;
5758
};
5859

5960
/// Keeps track of all requests that are currently in progress and coordinates

tools/SourceKit/tools/sourcekitd/bin/InProc/CodeCompletionSwiftInterop.cpp

+63-58
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ swiftide_connection_t swiftide_connection_create(void) {
136136
return swiftide_connection_create_with_inspection_instance(nullptr);
137137
}
138138

139-
swiftide_connection_t
140-
swiftide_connection_create_with_inspection_instance(void *opaqueIDESwiftInspectionInstance) {
139+
swiftide_connection_t swiftide_connection_create_with_inspection_instance(
140+
void *opaqueIDESwiftInspectionInstance) {
141141
static std::once_flag once;
142142
std::call_once(
143143
once, [] { llvm::sys::PrintStackTraceOnErrorSignal("IDESwiftInterop"); });
@@ -147,7 +147,6 @@ swiftide_connection_create_with_inspection_instance(void *opaqueIDESwiftInspecti
147147
return static_cast<swiftide_connection_t>(new Connection(inspectInstance));
148148
}
149149

150-
151150
void swiftide_connection_dispose(swiftide_connection_t conn) {
152151
assert(conn);
153152
delete static_cast<Connection *>(conn);
@@ -190,7 +189,9 @@ struct CompletionResult {
190189

191190
bool hasError() const { return !error.empty(); }
192191

193-
ArrayRef<CodeCompletionResult *> getCompletions() { return resultSink.Results; }
192+
ArrayRef<CodeCompletionResult *> getCompletions() {
193+
return resultSink.Results;
194+
}
194195
};
195196

196197
struct SwiftInteropCodeCompletionConsumer : public ide::CodeCompletionConsumer {
@@ -214,7 +215,8 @@ struct CompletionRequest {
214215
bool addInitsToTopLevel = false;
215216
bool addCallWithNoDefaultArgs = true;
216217

217-
CompletionRequest(const char *path, unsigned offset, ArrayRef<const char *>args) {
218+
CompletionRequest(const char *path, unsigned offset,
219+
ArrayRef<const char *> args) {
218220
this->path = StringRef(path).copy(allocator);
219221
this->offset = offset;
220222
compilerArguments.reserve(args.size());
@@ -234,12 +236,12 @@ void swiftide_cancel_request(swiftide_connection_t _conn,
234236
}
235237

236238
swiftide_completion_request_t
237-
swiftide_completion_request_create(const char *path,
238-
uint32_t offset,
239-
char *const *const compiler_args,
240-
uint32_t num_compiler_args) {
239+
swiftide_completion_request_create(const char *path, uint32_t offset,
240+
char *const *const compiler_args,
241+
uint32_t num_compiler_args) {
241242

242-
return new CompletionRequest(path, offset, llvm::ArrayRef(compiler_args, num_compiler_args));
243+
return new CompletionRequest(
244+
path, offset, llvm::ArrayRef(compiler_args, num_compiler_args));
243245
}
244246

245247
void swiftide_completion_request_dispose(swiftide_completion_request_t _req) {
@@ -368,7 +370,8 @@ void Connection::codeComplete(
368370

369371
std::string compilerInvocationError;
370372
bool creatingInvocationFailed = initCompilerInvocation(
371-
invocation, args, FrontendOptions::ActionType::Typecheck, diags, path, fileSystem, swiftExecutablePath, runtimeResourcePath,
373+
invocation, args, FrontendOptions::ActionType::Typecheck, diags, path,
374+
fileSystem, swiftExecutablePath, runtimeResourcePath,
372375
diagnosticsDocumentationPath, sessionTimestamp, compilerInvocationError);
373376
if (creatingInvocationFailed) {
374377
callback(ResultType::failure(compilerInvocationError));
@@ -682,35 +685,35 @@ swiftide_completion_item_get_associated_kind(swiftide_completion_item_t _item) {
682685
switch (item.getKind()) {
683686
case CodeCompletionResultKind::Declaration:
684687
switch (item.getAssociatedDeclKind()) {
685-
#define CASE(KIND, VAL) \
686-
case swift::ide::CodeCompletionDeclKind::KIND: \
687-
return SWIFTIDE_COMPLETION_ITEM_DECL_KIND_##VAL;
688-
689-
CASE(Module, MODULE)
690-
CASE(Class, CLASS)
691-
CASE(Actor, ACTOR)
692-
CASE(Struct, STRUCT)
693-
CASE(Enum, ENUM)
694-
CASE(EnumElement, ENUMELEMENT)
695-
CASE(Protocol, PROTOCOL)
696-
CASE(AssociatedType, ASSOCIATEDTYPE)
697-
CASE(TypeAlias, TYPEALIAS)
698-
CASE(GenericTypeParam, GENERICTYPEPARAM)
699-
CASE(Constructor, CONSTRUCTOR)
700-
CASE(Destructor, DESTRUCTOR)
701-
CASE(Subscript, SUBSCRIPT)
702-
CASE(StaticMethod, STATICMETHOD)
703-
CASE(InstanceMethod, INSTANCEMETHOD)
704-
CASE(PrefixOperatorFunction, PREFIXOPERATORFUNCTION)
705-
CASE(PostfixOperatorFunction, POSTFIXOPERATORFUNCTION)
706-
CASE(InfixOperatorFunction, INFIXOPERATORFUNCTION)
707-
CASE(FreeFunction, FREEFUNCTION)
708-
CASE(StaticVar, STATICVAR)
709-
CASE(InstanceVar, INSTANCEVAR)
710-
CASE(LocalVar, LOCALVAR)
711-
CASE(GlobalVar, GLOBALVAR)
712-
CASE(PrecedenceGroup, PRECEDENCEGROUP)
713-
CASE(Macro, MACRO)
688+
#define CASE(KIND, VAL) \
689+
case swift::ide::CodeCompletionDeclKind::KIND: \
690+
return SWIFTIDE_COMPLETION_ITEM_DECL_KIND_##VAL;
691+
692+
CASE(Module, MODULE)
693+
CASE(Class, CLASS)
694+
CASE(Actor, ACTOR)
695+
CASE(Struct, STRUCT)
696+
CASE(Enum, ENUM)
697+
CASE(EnumElement, ENUMELEMENT)
698+
CASE(Protocol, PROTOCOL)
699+
CASE(AssociatedType, ASSOCIATEDTYPE)
700+
CASE(TypeAlias, TYPEALIAS)
701+
CASE(GenericTypeParam, GENERICTYPEPARAM)
702+
CASE(Constructor, CONSTRUCTOR)
703+
CASE(Destructor, DESTRUCTOR)
704+
CASE(Subscript, SUBSCRIPT)
705+
CASE(StaticMethod, STATICMETHOD)
706+
CASE(InstanceMethod, INSTANCEMETHOD)
707+
CASE(PrefixOperatorFunction, PREFIXOPERATORFUNCTION)
708+
CASE(PostfixOperatorFunction, POSTFIXOPERATORFUNCTION)
709+
CASE(InfixOperatorFunction, INFIXOPERATORFUNCTION)
710+
CASE(FreeFunction, FREEFUNCTION)
711+
CASE(StaticVar, STATICVAR)
712+
CASE(InstanceVar, INSTANCEVAR)
713+
CASE(LocalVar, LOCALVAR)
714+
CASE(GlobalVar, GLOBALVAR)
715+
CASE(PrecedenceGroup, PRECEDENCEGROUP)
716+
CASE(Macro, MACRO)
714717
#undef CASE
715718
}
716719
llvm_unreachable("unhandled enum value");
@@ -727,20 +730,20 @@ uint32_t swiftide_completion_item_get_semantic_context(
727730
swiftide_completion_item_t _item) {
728731
auto &item = *static_cast<CodeCompletionResult *>(_item);
729732
switch (item.getSemanticContext()) {
730-
case swift::ide::SemanticContextKind::None:
731-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_NONE;
732-
case swift::ide::SemanticContextKind::Local:
733-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_LOCAL;
734-
case swift::ide::SemanticContextKind::CurrentNominal:
735-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_CURRENTNOMINAL;
736-
case swift::ide::SemanticContextKind::Super:
737-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_SUPER;
738-
case swift::ide::SemanticContextKind::OutsideNominal:
739-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_OUTSIDENOMINAL;
740-
case swift::ide::SemanticContextKind::CurrentModule:
741-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_CURRENTMODULE;
742-
case swift::ide::SemanticContextKind::OtherModule:
743-
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_OTHERMODULE;
733+
case swift::ide::SemanticContextKind::None:
734+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_NONE;
735+
case swift::ide::SemanticContextKind::Local:
736+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_LOCAL;
737+
case swift::ide::SemanticContextKind::CurrentNominal:
738+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_CURRENTNOMINAL;
739+
case swift::ide::SemanticContextKind::Super:
740+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_SUPER;
741+
case swift::ide::SemanticContextKind::OutsideNominal:
742+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_OUTSIDENOMINAL;
743+
case swift::ide::SemanticContextKind::CurrentModule:
744+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_CURRENTMODULE;
745+
case swift::ide::SemanticContextKind::OtherModule:
746+
return SWIFTIDE_COMPLETION_SEMANTIC_CONTEXT_OTHERMODULE;
744747
}
745748
}
746749

@@ -760,7 +763,8 @@ uint32_t swiftide_completion_item_get_flair(swiftide_completion_item_t _item) {
760763
result |= SWIFTIDE_COMPLETION_FLAIR_RAREKEYWORDATCURRENTPOSITION;
761764
if (flair.contains(CodeCompletionFlairBit::RareTypeAtCurrentPosition))
762765
result |= SWIFTIDE_COMPLETION_FLAIR_RARETYPEATCURRENTPOSITION;
763-
if (flair.contains(CodeCompletionFlairBit::ExpressionAtNonScriptOrMainFileScope))
766+
if (flair.contains(
767+
CodeCompletionFlairBit::ExpressionAtNonScriptOrMainFileScope))
764768
result |= SWIFTIDE_COMPLETION_FLAIR_EXPRESSIONATNONSCRIPTORMAINFILESCOPE;
765769
return result;
766770
}
@@ -792,8 +796,7 @@ uint32_t swiftide_completion_item_not_recommended_reason(
792796
}
793797
}
794798

795-
bool swiftide_completion_item_has_diagnostic(
796-
swiftide_completion_item_t _item) {
799+
bool swiftide_completion_item_has_diagnostic(swiftide_completion_item_t _item) {
797800
auto &item = *static_cast<CodeCompletionResult *>(_item);
798801
return (item.getNotRecommendedReason() != NotRecommendedReason::None);
799802
}
@@ -854,7 +857,9 @@ swiftide_completion_item_get_type_relation(swiftide_completion_item_t _item) {
854857
item.getExpectedTypeRelation());
855858
}
856859

857-
uint32_t swiftide_completion_item_import_depth(swiftide_completion_response_t _response, swiftide_completion_item_t _item) {
860+
uint32_t
861+
swiftide_completion_item_import_depth(swiftide_completion_response_t _response,
862+
swiftide_completion_item_t _item) {
858863
auto &response = *static_cast<CompletionResult *>(_response);
859864
auto &item = *static_cast<CodeCompletionResult *>(_item);
860865
if (item.getSemanticContext() == SemanticContextKind::OtherModule) {

0 commit comments

Comments
 (0)