Skip to content

Commit b18ec5f

Browse files
J-MR-TJ-MR-T
committed
[NFC] git-clang-format changes without regard for existing files
1 parent c93a542 commit b18ec5f

File tree

5 files changed

+102
-146
lines changed

5 files changed

+102
-146
lines changed

‎tools/SourceKit/include/SourceKit/Core/LangSupport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ class EditorConsumer {
391391
virtual void handleSemanticAnnotation(unsigned Offset, unsigned Length,
392392
UIdent Kind, bool isSystem) = 0;
393393

394-
virtual void handleDeclaration(unsigned Offset, unsigned Length,
395-
UIdent Kind, StringRef USR) = 0;
394+
virtual void handleDeclaration(unsigned Offset, unsigned Length, UIdent Kind,
395+
StringRef USR) = 0;
396396

397397
virtual void beginDocumentSubStructure(unsigned Offset, unsigned Length,
398398
UIdent Kind, UIdent AccessLevel,

‎tools/SourceKit/tools/sourcekitd/include/sourcekitd/DeclarationsArray.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ class DeclarationsArrayBuilder {
2828
DeclarationsArrayBuilder();
2929
~DeclarationsArrayBuilder();
3030

31-
void add(SourceKit::UIdent Kind,
32-
unsigned Offset,
33-
unsigned Length,
31+
void add(SourceKit::UIdent Kind, unsigned Offset, unsigned Length,
3432
llvm::StringRef USR);
3533

3634
bool empty() const;

‎tools/SourceKit/tools/sourcekitd/lib/API/DeclarationsArray.cpp

Lines changed: 72 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,52 @@ using namespace SourceKit;
2222
using namespace sourcekitd;
2323

2424
struct DeclarationsArrayBuilder::Implementation {
25-
CompactArrayBuilder<UIdent,
26-
unsigned,
27-
unsigned,
28-
StringRef> Builder;
25+
CompactArrayBuilder<UIdent, unsigned, unsigned, StringRef> Builder;
2926
};
3027

3128
DeclarationsArrayBuilder::DeclarationsArrayBuilder()
32-
: Impl(*new Implementation()) {
29+
: Impl(*new Implementation()) {}
3330

34-
}
35-
36-
DeclarationsArrayBuilder::~DeclarationsArrayBuilder() {
37-
delete &Impl;
38-
}
31+
DeclarationsArrayBuilder::~DeclarationsArrayBuilder() { delete &Impl; }
3932

40-
void DeclarationsArrayBuilder::add(
41-
UIdent Kind,
42-
unsigned Offset,
43-
unsigned Length,
44-
StringRef USR) {
33+
void DeclarationsArrayBuilder::add(UIdent Kind, unsigned Offset,
34+
unsigned Length, StringRef USR) {
4535

46-
Impl.Builder.addEntry(Kind,
47-
Offset,
48-
Length,
49-
USR);
36+
Impl.Builder.addEntry(Kind, Offset, Length, USR);
5037
}
5138

52-
bool DeclarationsArrayBuilder::empty() const {
53-
return Impl.Builder.empty();
54-
}
39+
bool DeclarationsArrayBuilder::empty() const { return Impl.Builder.empty(); }
5540

56-
std::unique_ptr<llvm::MemoryBuffer>
57-
DeclarationsArrayBuilder::createBuffer() {
41+
std::unique_ptr<llvm::MemoryBuffer> DeclarationsArrayBuilder::createBuffer() {
5842
return Impl.Builder.createBuffer(CustomBufferKind::DeclarationsArray);
5943
}
6044

6145
namespace {
6246

6347
class DeclarationsArray {
6448
public:
65-
typedef CompactArrayReader<sourcekitd_uid_t,
66-
unsigned,
67-
unsigned,
68-
const char*> CompactArrayReaderTy;
69-
70-
static void readElements(void *Buf, size_t Index,
71-
sourcekitd_uid_t &Kind,
72-
unsigned &Offset,
73-
unsigned &Length,
74-
const char* &USR) {
49+
typedef CompactArrayReader<sourcekitd_uid_t, unsigned, unsigned, const char *>
50+
CompactArrayReaderTy;
51+
52+
static void readElements(void *Buf, size_t Index, sourcekitd_uid_t &Kind,
53+
unsigned &Offset, unsigned &Length,
54+
const char *&USR) {
7555
CompactArrayReaderTy Reader(Buf);
76-
Reader.readEntries(Index,
77-
Kind,
78-
Offset,
79-
Length,
80-
USR);
56+
Reader.readEntries(Index, Kind, Offset, Length, USR);
8157
}
8258

83-
static bool apply(sourcekitd_uid_t Kind,
84-
unsigned Offset,
85-
unsigned Length,
86-
const char* USR,
87-
llvm::function_ref<bool(sourcekitd_uid_t,
88-
sourcekitd_variant_t)> applier) {
89-
90-
#define APPLY(K, Ty, Field) \
91-
do { \
92-
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
93-
sourcekitd_variant_t var = make##Ty##Variant(Field); \
94-
if (!applier(key, var)) return false; \
59+
static bool
60+
apply(sourcekitd_uid_t Kind, unsigned Offset, unsigned Length,
61+
const char *USR,
62+
llvm::function_ref<bool(sourcekitd_uid_t, sourcekitd_variant_t)>
63+
applier) {
64+
65+
#define APPLY(K, Ty, Field) \
66+
do { \
67+
sourcekitd_uid_t key = SKDUIDFromUIdent(K); \
68+
sourcekitd_variant_t var = make##Ty##Variant(Field); \
69+
if (!applier(key, var)) \
70+
return false; \
9571
} while (0)
9672

9773
APPLY(KeyKind, UID, Kind);
@@ -103,33 +79,26 @@ class DeclarationsArray {
10379
return true;
10480
}
10581

106-
static int64_t getInt(sourcekitd_uid_t Key,
107-
sourcekitd_uid_t Kind,
108-
unsigned Offset,
109-
unsigned Length,
110-
const char* USR) {
82+
static int64_t getInt(sourcekitd_uid_t Key, sourcekitd_uid_t Kind,
83+
unsigned Offset, unsigned Length, const char *USR) {
11184
if (Key == SKDUIDFromUIdent(KeyOffset))
11285
return Offset;
11386
if (Key == SKDUIDFromUIdent(KeyLength))
11487
return Length;
11588
return 0;
11689
}
11790

118-
static sourcekitd_uid_t getUID(sourcekitd_uid_t Key,
119-
sourcekitd_uid_t Kind,
120-
unsigned Offset,
121-
unsigned Length,
122-
const char* USR) {
91+
static sourcekitd_uid_t getUID(sourcekitd_uid_t Key, sourcekitd_uid_t Kind,
92+
unsigned Offset, unsigned Length,
93+
const char *USR) {
12394
if (Key == SKDUIDFromUIdent(KeyKind))
12495
return Kind;
12596
return nullptr;
12697
}
12798

128-
static const char* getString(sourcekitd_uid_t Key,
129-
sourcekitd_uid_t Kind,
130-
unsigned Offset,
131-
unsigned Length,
132-
const char* USR) {
99+
static const char *getString(sourcekitd_uid_t Key, sourcekitd_uid_t Kind,
100+
unsigned Offset, unsigned Length,
101+
const char *USR) {
133102
if (Key == SKDUIDFromUIdent(KeyUSR))
134103
return USR;
135104
return nullptr;
@@ -148,34 +117,32 @@ struct CompactVariantFuncs<DeclarationsArray> {
148117

149118
template <typename FnTy>
150119
static auto getElement(sourcekitd_variant_t dict, sourcekitd_uid_t key,
151-
const FnTy &Fn) -> decltype(Fn(nullptr, nullptr, 0, 0,
152-
nullptr)) {
153-
void *Buf = (void*)dict.data[1];
120+
const FnTy &Fn) -> decltype(Fn(nullptr, nullptr, 0, 0,
121+
nullptr)) {
122+
void *Buf = (void *)dict.data[1];
154123
size_t Index = dict.data[2];
155124

156125
sourcekitd_uid_t Kind;
157126
unsigned Offset;
158127
unsigned Length;
159-
const char* USR;
160-
DeclarationsArray::readElements(Buf, Index,
161-
Kind, Offset, Length, USR);
128+
const char *USR;
129+
DeclarationsArray::readElements(Buf, Index, Kind, Offset, Length, USR);
162130

163131
return Fn(key, Kind, Offset, Length, USR);
164132
}
165-
166-
static bool
167-
dictionary_apply(sourcekitd_variant_t dict,
168-
llvm::function_ref<bool(sourcekitd_uid_t,
169-
sourcekitd_variant_t)> applier) {
170-
void *Buf = (void*)dict.data[1];
133+
134+
static bool dictionary_apply(
135+
sourcekitd_variant_t dict,
136+
llvm::function_ref<bool(sourcekitd_uid_t, sourcekitd_variant_t)>
137+
applier) {
138+
void *Buf = (void *)dict.data[1];
171139
size_t Index = dict.data[2];
172140

173141
sourcekitd_uid_t Kind;
174142
unsigned Offset;
175143
unsigned Length;
176-
const char* USR;
177-
DeclarationsArray::readElements(Buf, Index,
178-
Kind, Offset, Length, USR);
144+
const char *USR;
145+
DeclarationsArray::readElements(Buf, Index, Kind, Offset, Length, USR);
179146
return DeclarationsArray::apply(Kind, Offset, Length, USR, applier);
180147
}
181148

@@ -191,8 +158,8 @@ struct CompactVariantFuncs<DeclarationsArray> {
191158
return getElement(dict, key, DeclarationsArray::getUID);
192159
}
193160

194-
static const char* dictionary_get_string(sourcekitd_variant_t dict,
195-
sourcekitd_uid_t key) {
161+
static const char *dictionary_get_string(sourcekitd_variant_t dict,
162+
sourcekitd_uid_t key) {
196163

197164
return getElement(dict, key, DeclarationsArray::getString);
198165
}
@@ -201,32 +168,31 @@ struct CompactVariantFuncs<DeclarationsArray> {
201168
};
202169

203170
VariantFunctions CompactVariantFuncs<DeclarationsArray>::Funcs = {
204-
get_type,
205-
nullptr/*Annot_array_apply*/,
206-
nullptr/*Annot_array_get_bool*/,
207-
nullptr/*Annot_array_get_count*/,
208-
nullptr/*Annot_array_get_int64*/,
209-
nullptr/*Annot_array_get_string*/,
210-
nullptr/*Annot_array_get_uid*/,
211-
nullptr/*Annot_array_get_value*/,
212-
nullptr/*Annot_bool_get_value*/,
213-
dictionary_apply,
214-
nullptr/*Annot_dictionary_get_bool*/,
215-
dictionary_get_int64,
216-
dictionary_get_string,
217-
nullptr/*Annot_dictionary_get_value*/,
218-
dictionary_get_uid,
219-
nullptr/*Annot_string_get_length*/,
220-
nullptr/*Annot_string_get_ptr*/,
221-
nullptr/*Annot_int64_get_value*/,
222-
nullptr/*Annot_uid_get_value*/,
223-
nullptr/*Annot_data_get_size*/,
224-
nullptr/*Annot_data_get_ptr*/,
171+
get_type,
172+
nullptr /*Annot_array_apply*/,
173+
nullptr /*Annot_array_get_bool*/,
174+
nullptr /*Annot_array_get_count*/,
175+
nullptr /*Annot_array_get_int64*/,
176+
nullptr /*Annot_array_get_string*/,
177+
nullptr /*Annot_array_get_uid*/,
178+
nullptr /*Annot_array_get_value*/,
179+
nullptr /*Annot_bool_get_value*/,
180+
dictionary_apply,
181+
nullptr /*Annot_dictionary_get_bool*/,
182+
dictionary_get_int64,
183+
dictionary_get_string,
184+
nullptr /*Annot_dictionary_get_value*/,
185+
dictionary_get_uid,
186+
nullptr /*Annot_string_get_length*/,
187+
nullptr /*Annot_string_get_ptr*/,
188+
nullptr /*Annot_int64_get_value*/,
189+
nullptr /*Annot_uid_get_value*/,
190+
nullptr /*Annot_data_get_size*/,
191+
nullptr /*Annot_data_get_ptr*/,
225192
};
226193

227194
} // namespace sourcekitd
228195

229-
VariantFunctions *
230-
sourcekitd::getVariantFunctionsForDeclarationsArray() {
196+
VariantFunctions *sourcekitd::getVariantFunctionsForDeclarationsArray() {
231197
return &CompactArrayFuncs<DeclarationsArray>::Funcs;
232198
}

‎tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
#include "SourceKit/Support/UIdent.h"
1314
#include "sourcekitd/CodeCompletionResultsArray.h"
15+
#include "sourcekitd/DeclarationsArray.h"
1416
#include "sourcekitd/DictionaryKeys.h"
1517
#include "sourcekitd/DocStructureArray.h"
1618
#include "sourcekitd/DocSupportAnnotationArray.h"
17-
#include "sourcekitd/TokenAnnotationsArray.h"
1819
#include "sourcekitd/ExpressionTypeArray.h"
19-
#include "sourcekitd/VariableTypeArray.h"
20-
#include "sourcekitd/DeclarationsArray.h"
2120
#include "sourcekitd/RawData.h"
2221
#include "sourcekitd/RequestResponsePrinterBase.h"
23-
#include "SourceKit/Support/UIdent.h"
22+
#include "sourcekitd/TokenAnnotationsArray.h"
23+
#include "sourcekitd/VariableTypeArray.h"
2424
#include "llvm/ADT/ArrayRef.h"
2525
#include "llvm/ADT/SmallString.h"
2626
#include "llvm/Support/ErrorHandling.h"
@@ -771,8 +771,8 @@ static sourcekitd_variant_t variantFromXPCObject(xpc_object_t obj) {
771771
return {{ (uintptr_t)getVariantFunctionsForTokenAnnotationsArray(),
772772
(uintptr_t)CUSTOM_BUF_START(obj), 0 }};
773773
case CustomBufferKind::DeclarationsArray:
774-
return {{ (uintptr_t)getVariantFunctionsForDeclarationsArray(),
775-
(uintptr_t)CUSTOM_BUF_START(obj), 0 }};
774+
return {{(uintptr_t)getVariantFunctionsForDeclarationsArray(),
775+
(uintptr_t)CUSTOM_BUF_START(obj), 0}};
776776
case CustomBufferKind::DocSupportAnnotationArray:
777777
return {{ (uintptr_t)getVariantFunctionsForDocSupportAnnotationArray(),
778778
(uintptr_t)CUSTOM_BUF_START(obj), 0 }};

0 commit comments

Comments
 (0)