Fix OptionDescriptor.isRenamed logic

nicklockwood · Aug 28, 2020 · b9aab40 · b9aab40
1 parent adcb27e
commit b9aab40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Sources/OptionDescriptor.swift b/Sources/OptionDescriptor.swift
@@ -70,6 +70,11 @@ class OptionDescriptor {
         return (try? toOptions(arg, &options)) != nil
     }
 
+    fileprivate func renamed(to newPropertyName: String) -> OptionDescriptor {
+        propertyName = newPropertyName
+        return self
+    }
+
     var isSetType: Bool {
         guard case .set = type else {
             return false
@@ -776,7 +781,8 @@ struct _Descriptors {
         keyPath: \.useVoid,
         trueValues: ["void"],
         falseValues: ["tuple", "tuples"]
-    )
+    ).renamed(to: "useVoid")
+
     let hexLiterals = OptionDescriptor(
         argumentName: "hexliterals",
         displayName: "hexliterals",
@@ -785,15 +791,17 @@ struct _Descriptors {
         keyPath: \.uppercaseHex,
         trueValues: ["uppercase", "upper"],
         falseValues: ["lowercase", "lower"]
-    )
+    ).renamed(to: "uppercaseHex")
+
     let wrapElements = OptionDescriptor(
         argumentName: "wrapelements",
         displayName: "Wrap Elements",
         help: "deprecated",
         deprecationMessage: "Use --wrapcollections instead.",
         keyPath: \.wrapCollections,
         options: ["before-first", "after-first", "preserve", "disabled"]
-    )
+    ).renamed(to: "wrapCollections")
+
     let specifierOrder = OptionDescriptor(
         argumentName: "specifierorder",
         displayName: "Specifier Order",
@@ -805,5 +813,5 @@ struct _Descriptors {
                 throw FormatError.options("'\($0)' is not a valid specifier")
             }
         }
-    )
+    ).renamed(to: "modifierOrder")
 }
diff --git a/Tests/ArgumentsTests.swift b/Tests/ArgumentsTests.swift
@@ -276,6 +276,11 @@ class ArgumentsTests: XCTestCase {
         XCTAssertEqual(args["header"], "//  Hello World\\n//  Goodbye World")
     }
 
+    // TODO: should this go in OptionDescriptorTests instead?
+    func testRenamedArgument() throws {
+        XCTAssert(Descriptors.specifierOrder.isRenamed)
+    }
+
     // MARK: config file parsing
 
     func testParseArgumentsContainingBlankLines() {

diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift
@@ -71,6 +71,7 @@ extension ArgumentsTests {
         ("testParseUppercaseIgnoreFileHeader", testParseUppercaseIgnoreFileHeader),
         ("testPreprocessArguments", testPreprocessArguments),
         ("testQuotedComment", testQuotedComment),
+        ("testRenamedArgument", testRenamedArgument),
         ("testRulesArgumentOverridesAllConfigRules", testRulesArgumentOverridesAllConfigRules),
         ("testSerializeFileHeaderContainingEscapedSpace", testSerializeFileHeaderContainingEscapedSpace),
         ("testSerializeFileHeaderContainingLinebreak", testSerializeFileHeaderContainingLinebreak),