From 31afd92d955c5ff5ade6d20f4f726de128ffd4d1 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 10 Jun 2022 11:30:11 -0700 Subject: [PATCH] a - Apply SwiftFormat --- swift/Package.swift | 12 ++++++++---- swift/Sources/GildedRose/GildedRose.swift | 14 +++++++------- swift/Sources/GildedRose/Item.swift | 4 ++-- swift/Sources/GildedRoseApp/main.swift | 19 ++++++++++--------- .../GildedRoseTests/GildedRoseTests.swift | 1 - 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/swift/Package.swift b/swift/Package.swift index 79c4c79f..f52c7bb1 100644 --- a/swift/Package.swift +++ b/swift/Package.swift @@ -7,17 +7,21 @@ let package = Package( products: [ .library( name: "GildedRose", - targets: ["GildedRose"]), + targets: ["GildedRose"] + ), ], targets: [ .target( name: "GildedRose", - dependencies: []), + dependencies: [] + ), .target( name: "GildedRoseApp", - dependencies: ["GildedRose"]), + dependencies: ["GildedRose"] + ), .testTarget( name: "GildedRoseTests", - dependencies: ["GildedRose"]), + dependencies: ["GildedRose"] + ), ] ) diff --git a/swift/Sources/GildedRose/GildedRose.swift b/swift/Sources/GildedRose/GildedRose.swift index 2e1cf4d2..ea0aa861 100644 --- a/swift/Sources/GildedRose/GildedRose.swift +++ b/swift/Sources/GildedRose/GildedRose.swift @@ -1,13 +1,13 @@ public class GildedRose { var items: [Item] - + public init(items: [Item]) { self.items = items } - + public func updateQuality() { for i in 0 ..< items.count { - if items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert" { + if items[i].name != "Aged Brie", items[i].name != "Backstage passes to a TAFKAL80ETC concert" { if items[i].quality > 0 { if items[i].name != "Sulfuras, Hand of Ragnaros" { items[i].quality = items[i].quality - 1 @@ -16,14 +16,14 @@ public class GildedRose { } else { if items[i].quality < 50 { items[i].quality = items[i].quality + 1 - + if items[i].name == "Backstage passes to a TAFKAL80ETC concert" { if items[i].sellIn < 11 { if items[i].quality < 50 { items[i].quality = items[i].quality + 1 } } - + if items[i].sellIn < 6 { if items[i].quality < 50 { items[i].quality = items[i].quality + 1 @@ -32,11 +32,11 @@ public class GildedRose { } } } - + if items[i].name != "Sulfuras, Hand of Ragnaros" { items[i].sellIn = items[i].sellIn - 1 } - + if items[i].sellIn < 0 { if items[i].name != "Aged Brie" { if items[i].name != "Backstage passes to a TAFKAL80ETC concert" { diff --git a/swift/Sources/GildedRose/Item.swift b/swift/Sources/GildedRose/Item.swift index d579d010..eb717bbb 100644 --- a/swift/Sources/GildedRose/Item.swift +++ b/swift/Sources/GildedRose/Item.swift @@ -2,7 +2,7 @@ public class Item { public var name: String public var sellIn: Int public var quality: Int - + public init(name: String, sellIn: Int, quality: Int) { self.name = name self.sellIn = sellIn @@ -12,6 +12,6 @@ public class Item { extension Item: CustomStringConvertible { public var description: String { - name + ", " + String(sellIn) + ", " + String(quality); + name + ", " + String(sellIn) + ", " + String(quality) } } diff --git a/swift/Sources/GildedRoseApp/main.swift b/swift/Sources/GildedRoseApp/main.swift index 78618ee4..edd7dc13 100644 --- a/swift/Sources/GildedRoseApp/main.swift +++ b/swift/Sources/GildedRoseApp/main.swift @@ -10,21 +10,22 @@ let items = [ Item(name: "Backstage passes to a TAFKAL80ETC concert", sellIn: 10, quality: 49), Item(name: "Backstage passes to a TAFKAL80ETC concert", sellIn: 5, quality: 49), // this conjured item does not work properly yet - Item(name: "Conjured Mana Cake", sellIn: 3, quality: 6)] + Item(name: "Conjured Mana Cake", sellIn: 3, quality: 6), +] -let app = GildedRose(items: items); +let app = GildedRose(items: items) -var days = 2; +var days = 2 if CommandLine.argc > 1 { days = Int(CommandLine.arguments[1])! + 1 } -for i in 0..