Skip to content

Commit 482d912

Browse files
committed
Ignore fileInfo requirements in Xcode Extension
1 parent 497ab7b commit 482d912

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

EditorExtension/Extension/FormatFileCommand.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ class FormatFileCommand: NSObject, XCSourceEditorCommand {
5151
formatOptions.indent = invocation.buffer.indentationString
5252
formatOptions.tabWidth = invocation.buffer.tabWidth
5353
formatOptions.swiftVersion = store.formatOptions.swiftVersion
54+
if formatOptions.requiresFileInfo {
55+
formatOptions.fileHeader = .ignore
56+
}
5457

5558
let output: [Token]
5659
do {

EditorExtension/Extension/FormatSelectionCommand.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class FormatSelectionCommand: NSObject, XCSourceEditorCommand {
5656
formatOptions.indent = invocation.buffer.indentationString
5757
formatOptions.tabWidth = invocation.buffer.tabWidth
5858
formatOptions.swiftVersion = store.formatOptions.swiftVersion
59+
if formatOptions.requiresFileInfo {
60+
formatOptions.fileHeader = .ignore
61+
}
5962

6063
// Apply formatting for each range
6164
var output = input

Sources/Options.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,11 @@ public struct FormatOptions: CustomStringConvertible {
534534
return indent.first == "\t"
535535
}
536536

537+
public var requiresFileInfo: Bool {
538+
let string = fileHeader.rawValue
539+
return string.contains("{created") || string.contains("{file")
540+
}
541+
537542
public var allOptions: [String: Any] {
538543
let pairs = Mirror(reflecting: self).children.map { ($0!, $1) }
539544
var options = Dictionary(pairs, uniquingKeysWith: { $1 })

0 commit comments

Comments
 (0)