Skip to content

Commit 0d42d7d

Browse files
committed
[gardening] format changed code
1 parent af78895 commit 0d42d7d

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

lib/IDE/CodeCompletionResultPrinter.cpp

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

13-
#include "swift/Basic/LLVM.h"
14-
#include "swift/AST/ASTPrinter.h"
1513
#include "swift/IDE/CodeCompletionResultPrinter.h"
14+
#include "swift/AST/ASTPrinter.h"
15+
#include "swift/Basic/LLVM.h"
1616
#include "swift/IDE/CodeCompletion.h"
1717
#include "swift/Markup/XMLUtils.h"
1818
#include "llvm/Support/raw_ostream.h"
@@ -259,8 +259,9 @@ void swift::ide::printCodeCompletionResultTypeNameAnnotated(const CodeCompletion
259259

260260
/// Provide the text for the call parameter, including constructing a typed
261261
/// editor placeholder for it.
262-
static void constructTextForCallParam(
263-
ArrayRef<CodeCompletionString::Chunk> ParamGroup, raw_ostream &OS) {
262+
static void
263+
constructTextForCallParam(ArrayRef<CodeCompletionString::Chunk> ParamGroup,
264+
raw_ostream &OS) {
264265
assert(ParamGroup.front().is(ChunkKind::CallParameterBegin));
265266

266267
for (; !ParamGroup.empty(); ParamGroup = ParamGroup.slice(1)) {
@@ -339,7 +340,8 @@ static void constructTextForCallParam(
339340
OS << "#>";
340341
}
341342

342-
void swift::ide::printCodeCompletionResultSourceText(const CodeCompletionResult &Result, llvm::raw_ostream &OS) {
343+
void swift::ide::printCodeCompletionResultSourceText(
344+
const CodeCompletionResult &Result, llvm::raw_ostream &OS) {
343345
auto Chunks = Result.getCompletionString()->getChunks();
344346
for (size_t i = 0; i < Chunks.size(); ++i) {
345347
auto &C = Chunks[i];
@@ -353,14 +355,16 @@ void swift::ide::printCodeCompletionResultSourceText(const CodeCompletionResult
353355
if (Chunks[i].endsPreviousNestedGroup(C.getNestingLevel()))
354356
break;
355357
}
356-
constructTextForCallParam(Chunks.slice(Start, i-Start), OS);
358+
constructTextForCallParam(Chunks.slice(Start, i - Start), OS);
357359
--i;
358360
continue;
359361
}
360362
if (C.is(ChunkKind::TypeAnnotationBegin)) {
361363
// Skip type annotation structure.
362364
auto level = C.getNestingLevel();
363-
do { ++i; } while (i != Chunks.size() && !Chunks[i].endsPreviousNestedGroup(level));
365+
do {
366+
++i;
367+
} while (i != Chunks.size() && !Chunks[i].endsPreviousNestedGroup(level));
364368
--i;
365369
}
366370
if (!C.isAnnotation() && C.hasText()) {
@@ -369,7 +373,8 @@ void swift::ide::printCodeCompletionResultSourceText(const CodeCompletionResult
369373
}
370374
}
371375

372-
void swift::ide::printCodeCompletionResultFilterName(const CodeCompletionResult &Result, llvm::raw_ostream &OS) {
376+
void swift::ide::printCodeCompletionResultFilterName(
377+
const CodeCompletionResult &Result, llvm::raw_ostream &OS) {
373378
auto str = Result.getCompletionString();
374379
// FIXME: we need a more uniform way to handle operator completions.
375380
if (str->getChunks().size() == 1 && str->getChunks()[0].is(ChunkKind::Dot)) {
@@ -414,7 +419,9 @@ void swift::ide::printCodeCompletionResultFilterName(const CodeCompletionResult
414419
case ChunkKind::TypeAnnotationBegin: {
415420
// Skip call parameter type or type annotation structure.
416421
auto nestingLevel = C.getNestingLevel();
417-
do { ++i; } while (i != e && !i->endsPreviousNestedGroup(nestingLevel));
422+
do {
423+
++i;
424+
} while (i != e && !i->endsPreviousNestedGroup(nestingLevel));
418425
--i;
419426
continue;
420427
}
@@ -430,5 +437,5 @@ void swift::ide::printCodeCompletionResultFilterName(const CodeCompletionResult
430437
if (C.hasText() && shouldPrint)
431438
OS << C.getText();
432439
}
433-
}
440+
}
434441
}

tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,10 @@ bool SwiftASTManager::initCompilerInvocation(
418418
DiagnosticEngine &Diags, StringRef UnresolvedPrimaryFile,
419419
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
420420
std::string &Error) {
421-
return ide::initCompilerInvocation(Invocation, OrigArgs, Diags, UnresolvedPrimaryFile, FileSystem, Impl.RuntimeResourcePath, Impl.DiagnosticDocumentationPath, Impl.Config->shouldOptimizeForIDE(), Impl.SessionTimestamp, Error);
421+
return ide::initCompilerInvocation(
422+
Invocation, OrigArgs, Diags, UnresolvedPrimaryFile, FileSystem,
423+
Impl.RuntimeResourcePath, Impl.DiagnosticDocumentationPath,
424+
Impl.Config->shouldOptimizeForIDE(), Impl.SessionTimestamp, Error);
422425
}
423426

424427
bool SwiftASTManager::initCompilerInvocation(CompilerInvocation &CompInvok,

0 commit comments

Comments
 (0)