Adds TabWidthMeasurer (#360)

* Adds TabWidthMeasurer * Fixes typo
simonbs · Mar 16, 2024 · e21d5ac · e21d5ac
1 parent 392e97f
commit e21d5ac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Sources/Runestone/Library/TabWidthMeasurer.swift b/Sources/Runestone/Library/TabWidthMeasurer.swift
@@ -0,0 +1,12 @@
+import UIKit
+
+enum TabWidthMeasurer {
+    static func tabWidth(tabLength: Int, font: UIFont) -> CGFloat {
+        let str = String(repeating: " ", count: tabLength)
+        let maxSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: .greatestFiniteMagnitude)
+        let options: NSStringDrawingOptions = [.usesFontLeading, .usesLineFragmentOrigin]
+        let attributes: [NSAttributedString.Key: Any] = [.font: font]
+        let bounds = str.boundingRect(with: maxSize, options: options, attributes: attributes, context: nil)
+        return round(bounds.size.width)
+    }
+}
diff --git a/Sources/Runestone/TextView/Indent/IndentController.swift b/Sources/Runestone/TextView/Indent/IndentController.swift
@@ -30,12 +30,7 @@ final class IndentController {
         if let tabWidth = _tabWidth {
             return tabWidth
         } else {
-            let str = String(repeating: " ", count: indentStrategy.tabLength)
-            let maxSize = CGSize(width: CGFloat.greatestFiniteMagnitude, height: .greatestFiniteMagnitude)
-            let options: NSStringDrawingOptions = [.usesFontLeading, .usesLineFragmentOrigin]
-            let attributes: [NSAttributedString.Key: Any] = [.font: indentFont]
-            let bounds = str.boundingRect(with: maxSize, options: options, attributes: attributes, context: nil)
-            let tabWidth = round(bounds.size.width)
+            let tabWidth = TabWidthMeasurer.tabWidth(tabLength: indentStrategy.tabLength, font: indentFont)
             if tabWidth != _tabWidth {
                 _tabWidth = tabWidth
                 delegate?.indentControllerDidUpdateTabWidth(self)

diff --git a/Sources/Runestone/TextView/Indent/IndentStrategy.swift b/Sources/Runestone/TextView/Indent/IndentStrategy.swift
@@ -2,7 +2,7 @@ import Foundation
 
 /// Strategy to use when indenting text.
 public enum IndentStrategy: Equatable {
-    /// Indent using tabs. The length specified length is used to determine the width of the tab measured in space characers.
+    /// Indent using tabs. The specified length is used to determine the width of the tab measured in space characers.
     case tab(length: Int)
     /// Indent using a number of spaces.
     case space(length: Int)