Don't override shared options with inferred value

nicklockwood · Jul 12, 2020 · 1f5a2e8 · 1f5a2e8
1 parent f16da00
commit 1f5a2e8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Sources/SwiftFormat.swift b/Sources/SwiftFormat.swift
@@ -470,9 +470,12 @@ private func applyRules(
 
     // Infer shared options
     var options = options
-    let sharedOptions = FormatRules.sharedOptionsForRules(rules).compactMap {
-        FormatOptions.Descriptor.byName[$0]?.propertyName
-    }
+    let sharedOptions = FormatRules
+        .sharedOptionsForRules(rules)
+        .compactMap { FormatOptions.Descriptor.byName[$0] }
+        .filter { $0.defaultArgument == $0.fromOptions(options) }
+        .map { $0.propertyName }
+
     inferFormatOptions(sharedOptions, from: tokens, into: &options)
 
     // Check if required FileInfo is available