self. は省略される傾向があるため、それが明らかに不要な箇所については省略しました。

省略推奨についての確かな根拠は見つけられませんでした。以前に The Swift Programming Language で「通常は省略する」という記載があった気がしたのですけれど、探しても見つけられなかったため、省略しない方針もアリかもしれません。その場合はこのコミットを Revert しましょう。
yumemi-inc · Apr 30, 2024 · 8365b54 · 8365b54
1 parent fa66109
commit 8365b54
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/Example/Example/Model/DisasterModel.swift b/Example/Example/Model/DisasterModel.swift
@@ -20,15 +20,15 @@ class DisasterModelImpl: DisasterModel {
     }
 
     func fetchDisaster(completion: ((String) -> Void)?) {
-        self.fetchDisasterHandler = completion
-        self.yumemiDisaster.fetchDisaster()
+        fetchDisasterHandler = completion
+        yumemiDisaster.fetchDisaster()
     }
 }
 
 extension DisasterModelImpl: YumemiDisasterHandleDelegate {
 
     func handle(disaster: String) {
-        self.fetchDisasterHandler?(disaster)
+        fetchDisasterHandler?(disaster)
     }
 
 }
diff --git a/Example/Example/UI/Weather/WeatherViewController.swift b/Example/Example/UI/Weather/WeatherViewController.swift
@@ -30,7 +30,7 @@ class WeatherViewController: UIViewController {
         super.viewDidLoad()
 
         NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: nil) { [unowned self] notification in
-            self.loadWeather(notification.object)
+            loadWeather(notification.object)
         }
     }
 
@@ -39,11 +39,11 @@ class WeatherViewController: UIViewController {
     }
 
     @IBAction func dismiss(_ sender: Any) {
-        self.dismiss(animated: true, completion: nil)
+        dismiss(animated: true, completion: nil)
     }
 
     @IBAction func loadWeather(_ sender: Any?) {
-        self.activityIndicator.startAnimating()
+        activityIndicator.startAnimating()
         weatherModel.fetchWeather(at: "tokyo", date: Date()) { result in
             DispatchQueue.main.async {
                 self.activityIndicator.stopAnimating()
@@ -58,9 +58,9 @@ class WeatherViewController: UIViewController {
     func handleWeather(result: Result<Response, WeatherError>) {
         switch result {
         case .success(let response):
-            self.weatherImageView.set(weather: response.weather)
-            self.minTempLabel.text = String(response.minTemp)
-            self.maxTempLabel.text = String(response.maxTemp)
+            weatherImageView.set(weather: response.weather)
+            minTempLabel.text = String(response.minTemp)
+            maxTempLabel.text = String(response.maxTemp)
 
         case .failure(let error):
             let message: String
@@ -79,7 +79,7 @@ class WeatherViewController: UIViewController {
                     print("Close ViewController by \(alertController)")
                 }
             })
-            self.present(alertController, animated: true, completion: nil)
+            present(alertController, animated: true, completion: nil)
         }
     }
 }
@@ -88,14 +88,14 @@ private extension UIImageView {
     func set(weather: Weather) {
         switch weather {
         case .sunny:
-            self.image = R.image.sunny()
-            self.tintColor = R.color.red()
+            image = R.image.sunny()
+            tintColor = R.color.red()
         case .cloudy:
-            self.image = R.image.cloudy()
-            self.tintColor = R.color.gray()
+            image = R.image.cloudy()
+            tintColor = R.color.gray()
         case .rainy:
-            self.image = R.image.rainy()
-            self.tintColor = R.color.blue()
+            image = R.image.rainy()
+            tintColor = R.color.blue()
         }
     }
 }
diff --git a/Sources/YumemiWeather/YumemiDisaster.swift b/Sources/YumemiWeather/YumemiDisaster.swift
@@ -18,7 +18,7 @@ public class YumemiDisaster {
     public init() {}
 
     public func fetchDisaster() {
-        self.delegate?.handle(disaster: "只今、災害情報はありません。")
+        delegate?.handle(disaster: "只今、災害情報はありません。")
     }
 
 }
diff --git a/Sources/YumemiWeather/YumemiWeather.swift b/Sources/YumemiWeather/YumemiWeather.swift
@@ -79,7 +79,7 @@ final public class YumemiWeather {
     /// 擬似 天気予報 API Simple ver
     /// - Returns: 天気状況を表す文字列 "sunny" or "cloudy" or "rainy"
     public static func fetchWeatherCondition() -> String {
-        return self.makeRandomResponse().weatherCondition
+        return makeRandomResponse().weatherCondition
     }
 
     /// 擬似 天気予報 API Throws ver
@@ -92,7 +92,7 @@ final public class YumemiWeather {
             throw YumemiWeatherError.unknownError
         }
 
-        return self.makeRandomResponse().weatherCondition
+        return makeRandomResponse().weatherCondition
     }
 
     /// 擬似 天気予報 API JSON ver
@@ -155,7 +155,7 @@ final public class YumemiWeather {
     /// - Returns: Weather レスポンスの JSON 文字列
     public static func syncFetchWeather(_ jsonString: String) throws -> String {
         Thread.sleep(forTimeInterval: apiDuration)
-        return try self.fetchWeather(jsonString)
+        return try fetchWeather(jsonString)
     }
 
     /// 擬似 天気予報 API Callback ver

diff --git a/Sources/YumemiWeather/YumemiWeatherList.swift b/Sources/YumemiWeather/YumemiWeatherList.swift
@@ -106,7 +106,7 @@ public extension YumemiWeather {
     /// - Returns: 返された AreaResponse の JSON 文字列
     static func syncFetchWeatherList(_ jsonString: String) throws -> String {
         Thread.sleep(forTimeInterval: apiDuration)
-        return try self.fetchWeatherList(jsonString)
+        return try fetchWeatherList(jsonString)
     }
 
     /// 擬似 天気予報一覧 API Callback ver

diff --git a/Tests/YumemiWeatherTests/YumemiWeatherTests.swift b/Tests/YumemiWeatherTests/YumemiWeatherTests.swift
@@ -94,7 +94,7 @@ final class YumemiWeatherTests: XCTestCase {
                 XCTAssertEqual(error, YumemiWeatherError.unknownError)
             }
         }
-        self.wait(for: [exp], timeout: YumemiWeather.apiDuration + 0.1)
+        wait(for: [exp], timeout: YumemiWeather.apiDuration + 0.1)
     }
 
     @available(iOS 13, macOS 10.15, *)