Tidy up the code (refactoring)

Author: mshibanami

Sources/ResizingTextView/ResizingTextView.swift

@@ -1,8 +1,8 @@
 //  Copyright © 2022 Manabu Nakazawa. All rights reserved.
 
+import Combine
 import Foundation
 import SwiftUI
-import Combine
 
 public struct ResizingTextView: View, Equatable {
     @Binding var text: String
@@ -28,6 +28,7 @@ public struct ResizingTextView: View, Equatable {
     public static var defaultLabelColor: NSColor {
         NSColor.labelColor
     }
+
 #elseif os(iOS)
     public static var defaultLabelColor: UIColor {
         UIColor.label
@@ -86,7 +87,8 @@ public struct ResizingTextView: View, Equatable {
             .frame(
                 maxWidth: hasGreedyWidth ? .infinity : nil,
                 maxHeight: (isEditable && isScrollable) ? .infinity : nil,
-                alignment: .leading)
+                alignment: .leading
+            )
             .opacity(0)
             .layoutPriority(1)
     }
@@ -124,7 +126,8 @@ public struct ResizingTextView: View, Equatable {
         .roundedFilledBorder(
             isEditable ? Color(UXColor.separatorColor) : .clear,
             width: isEditable ? 1 : 0,
-            cornerRadius: isEditable ? 10 : 0)
+            cornerRadius: isEditable ? 10 : 0
+        )
         .overlay(RoundedRectangle(cornerRadius: 10)
             .stroke(Color.accentColor.opacity(0.5), lineWidth: 4)
             .opacity(isFocused && isEditable ? 1 : 0).scaleEffect(isFocused && isEditable ? 1 : 1.03))
@@ -140,7 +143,8 @@ public struct ResizingTextView: View, Equatable {
                 canHaveNewLineCharacters: canHaveNewLineCharacters,
                 foregroundColor: Color(foregroundColor),
                 autocapitalizationType: autocapitalizationType,
-                textContainerInset: textContainerInset)
+                textContainerInset: textContainerInset
+            )
             if let placeholder {
                 Text(placeholder)
                     .font(Font(font))
@@ -156,16 +160,16 @@ public struct ResizingTextView: View, Equatable {
 
     public static func == (lhs: ResizingTextView, rhs: ResizingTextView) -> Bool {
         var result = lhs.text == rhs.text
-        && lhs.placeholder == rhs.placeholder
-        && lhs.isEditable == rhs.isEditable
-        && lhs.isScrollable == rhs.isScrollable
-        && lhs.isSelectable == rhs.isSelectable
-        && lhs.lineLimit == rhs.lineLimit
-        && lhs.font == rhs.font
-        && lhs.canHaveNewLineCharacters == rhs.canHaveNewLineCharacters
-        && lhs.foregroundColor == rhs.foregroundColor
-        && lhs.hasGreedyWidth == rhs.hasGreedyWidth
-        && lhs.isFocused == rhs.isFocused
+            && lhs.placeholder == rhs.placeholder
+            && lhs.isEditable == rhs.isEditable
+            && lhs.isScrollable == rhs.isScrollable
+            && lhs.isSelectable == rhs.isSelectable
+            && lhs.lineLimit == rhs.lineLimit
+            && lhs.font == rhs.font
+            && lhs.canHaveNewLineCharacters == rhs.canHaveNewLineCharacters
+            && lhs.foregroundColor == rhs.foregroundColor
+            && lhs.hasGreedyWidth == rhs.hasGreedyWidth
+            && lhs.isFocused == rhs.isFocused
 #if os(macOS)
         result = result && lhs.focusesNextKeyViewByTabKey == rhs.focusesNextKeyViewByTabKey
 #elseif os(iOS)

Sources/ResizingTextView/TextView (AppKit).swift

@@ -20,19 +20,20 @@ struct TextView: NSViewRepresentable {
     var onInsertNewline: (() -> Bool)?
     var textContainerInset: CGSize
 
-    init(_ text: Binding<String>,
-         placeholder: String?,
-         isEditable: Bool,
-         isScrollable: Bool,
-         isSelectable: Bool,
-         lineLimit: Int,
-         font: NSFont,
-         canHaveNewLineCharacters: Bool,
-         focusesNextKeyViewByTabKey: Bool,
-         foregroundColor: Color?,
-         onFocusChanged: ((Bool) -> Void)?,
-         onInsertNewline: (() -> Bool)?,
-         textContainerInset: CGSize?
+    init(
+        _ text: Binding<String>,
+        placeholder: String?,
+        isEditable: Bool,
+        isScrollable: Bool,
+        isSelectable: Bool,
+        lineLimit: Int,
+        font: NSFont,
+        canHaveNewLineCharacters: Bool,
+        focusesNextKeyViewByTabKey: Bool,
+        foregroundColor: Color?,
+        onFocusChanged: ((Bool) -> Void)?,
+        onInsertNewline: (() -> Bool)?,
+        textContainerInset: CGSize?
     ) {
         self._text = text
         self.placeholder = placeholder
@@ -104,8 +105,9 @@ struct TextView: NSViewRepresentable {
                 string: placeholder,
                 attributes: [
                     .foregroundColor: NSColor.placeholderTextColor,
-                    .font: font
-                ])
+                    .font: font,
+                ]
+            )
         } else {
             textView.placeholderAttributedString = nil
         }
@@ -176,7 +178,7 @@ struct TextView: NSViewRepresentable {
         }
 
         func textView(_ textView: NSTextView, shouldChangeTextIn affectedCharRange: NSRange, replacementString: String?) -> Bool {
-            if (replacementString == "\n") && !parent.canHaveNewLineCharacters {
+            if replacementString == "\n", !parent.canHaveNewLineCharacters {
                 return false
             }
             return true
@@ -207,6 +209,7 @@ class TextEnclosingScrollView: NSScrollView {
         super.init(frame: .zero)
     }
 
+    @available(*, unavailable)
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }

Sources/ResizingTextView/TextView (UIKit).swift

@@ -1,8 +1,8 @@
 //  Copyright © 2022 Manabu Nakazawa. All rights reserved.
 
 #if os(iOS)
-import UIKit
 import SwiftUI
+import UIKit
 
 struct TextView: UIViewRepresentable {
     static let defaultForegroundColor = Color(UIColor.label)
@@ -19,16 +19,18 @@ struct TextView: UIViewRepresentable {
     private var autocapitalizationType: UITextAutocapitalizationType
     private var textContainerInset: UIEdgeInsets
 
-    init(_ text: Binding<String>,
-         isEditable: Bool,
-         isScrollable: Bool,
-         isSelectable: Bool,
-         lineLimit: Int,
-         font: UIFont,
-         canHaveNewLineCharacters: Bool,
-         foregroundColor: Color,
-         autocapitalizationType: UITextAutocapitalizationType,
-         textContainerInset: UIEdgeInsets?) {
+    init(
+        _ text: Binding<String>,
+        isEditable: Bool,
+        isScrollable: Bool,
+        isSelectable: Bool,
+        lineLimit: Int,
+        font: UIFont,
+        canHaveNewLineCharacters: Bool,
+        foregroundColor: Color,
+        autocapitalizationType: UITextAutocapitalizationType,
+        textContainerInset: UIEdgeInsets?
+    ) {
         self._text = text
         self.isEditable = isEditable
         self.isScrollable = isScrollable
@@ -98,7 +100,7 @@ struct TextView: UIViewRepresentable {
             needsInvalidateIntrinsicContentSize = true
         }
 
-        if needsInvalidateIntrinsicContentSize && !isScrollable {
+        if needsInvalidateIntrinsicContentSize, !isScrollable {
             view.invalidateIntrinsicContentSize()
         }
     }
@@ -146,6 +148,7 @@ class CustomTextView: UITextView {
         isScrollEnabled = true
     }
 
+    @available(*, unavailable)
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -160,8 +163,8 @@ class CustomTextView: UITextView {
 
     override open var intrinsicContentSize: CGSize {
         return hasDynamicHeight
-        ? contentSize
-        : super.intrinsicContentSize
+            ? contentSize
+            : super.intrinsicContentSize
     }
 }
 #endif

Sources/ResizingTextView/View+Extensions.swift

@@ -3,7 +3,7 @@
 import SwiftUI
 
 extension View {
-    func roundedFilledBorder<S>(_ content: S, width: CGFloat, cornerRadius: CGFloat) -> some View where S: ShapeStyle {
+    func roundedFilledBorder(_ content: some ShapeStyle, width: CGFloat, cornerRadius: CGFloat) -> some View {
         let roundedRect = RoundedRectangle(cornerRadius: cornerRadius)
         return clipShape(roundedRect)
             .overlay(roundedRect.strokeBorder(content, lineWidth: width))