averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] CodeFormatter should know which options to apply.

Browse Source 
CodeFormatter no longer depends on EditorDocument
This commit is contained in:
John Regner
2016-02-28 11:16:52 -08:00
parent 43cc6ffafc
commit 377397e4af
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -1467,14 +1467,13 @@ public:
};
class CodeFormatter {
SwiftEditorDocument &Doc;
EditorConsumer &Consumer;
CodeFormatOptions &FmtOptions;
public:
CodeFormatter(SwiftEditorDocument &Doc, EditorConsumer &Consumer)
:Doc(Doc), Consumer(Consumer) { }
CodeFormatter(EditorConsumer &Consumer, CodeFormatOptions &Options)
:Consumer(Consumer), FmtOptions(Options) { }
std::pair<SwiftEditorLineRange,StringRef> indent(unsigned LineIndex, FormatContext &FC, StringRef Text) {
auto &FmtOptions = Doc.getFormatOptions();
// If having sibling locs to align with, respect siblings.
if (FC.HasSibling()) {
@@ -1986,7 +1985,8 @@ void SwiftEditorDocument::formatText(unsigned Line, unsigned Length,
size_t Offset = getOffsetOfTrimmedLine(Line, Text);
SourceLoc Loc = SM.getLocForBufferStart(BufID).getAdvancedLoc(Offset);
FormatContext FC = walker.walkToLocation(Loc);
CodeFormatter CF(*this, Consumer);
CodeFormatOptions Options = getFormatOptions();
CodeFormatter CF(Consumer, Options);
SwiftEditorLineRange LineRange = CF.indent(Line, FC, Text).first;
Consumer.recordAffectedLineRange(LineRange.startLine(), LineRange.lineCount());
}