Add os_log to --selfrequired defaults

nicklockwood · Jun 9, 2024 · eeb37b5 · eeb37b5
1 parent a7675e4
commit eeb37b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Sources/FormattingHelpers.swift b/Sources/FormattingHelpers.swift
@@ -66,6 +66,7 @@ extension Formatter {
  if let prevIndex = self.index(of: .nonSpaceOrCommentOrLinebreak, before: scopeStart),
  isSymbol(at: prevIndex, in: staticSelf ? [] : options.selfRequired.union([
  "expect", // Special case to support autoclosure arguments in the Nimble framework
+ "os_log", // Special case to support string interpolation inside os_log
  ])) || isAttribute(at: prevIndex)
  {
  return false

diff --git a/Tests/RulesTests+Redundancy.swift b/Tests/RulesTests+Redundancy.swift
@@ -3921,6 +3921,16 @@ class RedundancyTests: RulesTests {
  testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
  }
 
+ func testNoRemoveSelfInOSLogFunction() {
+ let input = """
+ func testFoo() {
+ os_log("error: \\(self.bar) is nil")
+ }
+ """
+ let options = FormatOptions(swiftVersion: "5.4")
+ testFormatting(for: input, rule: FormatRules.redundantSelf, options: options)
+ }
+
  func testNoRemoveSelfInExcludedFunction() {
  let input = """
  class Foo {