Moved NSFont extension to its own file

Author: austincondiff

CodeEdit.xcodeproj/project.pbxproj

@@ -487,6 +487,7 @@
 		B6C6A42E29771A8D00A3D28F /* EditorTabButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42D29771A8D00A3D28F /* EditorTabButtonStyle.swift */; };
 		B6C6A43029771F7100A3D28F /* EditorTabBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42F29771F7100A3D28F /* EditorTabBackground.swift */; };
 		B6CFD80D2C1B9A8000E63F1A /* FontWeightPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CFD80C2C1B9A8000E63F1A /* FontWeightPicker.swift */; };
+		B6CFD8112C20A8EE00E63F1A /* NSFont+WithWeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CFD8102C20A8EE00E63F1A /* NSFont+WithWeight.swift */; };
 		B6D7EA592971078500301FAC /* InspectorSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D7EA582971078500301FAC /* InspectorSection.swift */; };
 		B6D7EA5C297107DD00301FAC /* InspectorField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D7EA5B297107DD00301FAC /* InspectorField.swift */; };
 		B6E41C7029DD157F0088F9F4 /* AccountsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */; };
@@ -1058,6 +1059,7 @@
 		B6C6A42D29771A8D00A3D28F /* EditorTabButtonStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorTabButtonStyle.swift; sourceTree = "<group>"; };
 		B6C6A42F29771F7100A3D28F /* EditorTabBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTabBackground.swift; sourceTree = "<group>"; };
 		B6CFD80C2C1B9A8000E63F1A /* FontWeightPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontWeightPicker.swift; sourceTree = "<group>"; };
+		B6CFD8102C20A8EE00E63F1A /* NSFont+WithWeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSFont+WithWeight.swift"; sourceTree = "<group>"; };
 		B6D7EA582971078500301FAC /* InspectorSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorSection.swift; sourceTree = "<group>"; };
 		B6D7EA5B297107DD00301FAC /* InspectorField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorField.swift; sourceTree = "<group>"; };
 		B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsView.swift; sourceTree = "<group>"; };
@@ -2975,6 +2977,7 @@
 			isa = PBXGroup;
 			children = (
 				58F2EAD8292FB2B0004A9BDE /* TextEditingSettings.swift */,
+				B6CFD8102C20A8EE00E63F1A /* NSFont+WithWeight.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -3495,6 +3498,7 @@
 				58798284292ED0FB0085B254 /* TerminalEmulatorView.swift in Sources */,
 				B6C4F2AC2B3CC4D000B2B140 /* CommitChangedFileListItemView.swift in Sources */,
 				6C82D6B329BFD88700495C54 /* NavigateCommands.swift in Sources */,
+				B6CFD8112C20A8EE00E63F1A /* NSFont+WithWeight.swift in Sources */,
 				B66A4E4C29C9179B004573B4 /* CodeEditApp.swift in Sources */,
 				661EF7B82BEE215300C3E577 /* ImageFileView.swift in Sources */,
 				4E7F066629602E7B00BB3C12 /* CodeEditSplitViewController.swift in Sources */,

CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/NSFont+WithWeight.swift

@@ -0,0 +1,58 @@
+//
+//  NSFont+WithWeight.swift
+//  CodeEdit
+//
+//  Created by Austin Condiff on 6/17/24.
+//
+
+import SwiftUI
+
+extension NSFont {
+    /// Rough mapping from behavior of .systemFont(…weight:)
+    /// to NSFontManager's Int-based weight, as of 13.4 Ventura
+    func withWeight(weight: NSFont.Weight) -> NSFont? {
+        let fontManager = NSFontManager.shared
+        var intWeight: Int
+
+        switch weight {
+        case .ultraLight:
+            intWeight=0
+        case .light:
+            intWeight=2
+        case .thin:
+            intWeight=3
+        case .medium:
+            intWeight=6
+        case .semibold:
+            intWeight=8
+        case .bold:
+            intWeight=9
+        case .heavy:
+            intWeight=10
+        case .black:
+            intWeight=15
+        default:
+            intWeight=5
+        }
+
+        return fontManager.font(
+            withFamily: self.familyName ?? "",
+            traits: [],
+            weight: intWeight,
+            size: self.pointSize
+        )
+    }
+}
+
+extension NSFont.Weight: Codable {
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(self.rawValue)
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let rawValue = try container.decode(CGFloat.self)
+        self = NSFont.Weight(rawValue: rawValue)
+    }
+}

CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift

@@ -192,53 +192,3 @@ extension SettingsData {
         }
     }
 }
-
-extension NSFont {
-    /// Rough mapping from behavior of .systemFont(…weight:)
-    /// to NSFontManager's Int-based weight, as of 13.4 Ventura
-    func withWeight(weight: NSFont.Weight) -> NSFont? {
-        let fontManager = NSFontManager.shared
-        var intWeight: Int
-
-        switch weight {
-        case .ultraLight:
-            intWeight=0
-        case .light:
-            intWeight=2
-        case .thin:
-            intWeight=3
-        case .medium:
-            intWeight=6
-        case .semibold:
-            intWeight=8
-        case .bold:
-            intWeight=9
-        case .heavy:
-            intWeight=10
-        case .black:
-            intWeight=15
-        default:
-            intWeight=5
-        }
-
-        return fontManager.font(
-            withFamily: self.familyName ?? "",
-            traits: [],
-            weight: intWeight,
-            size: self.pointSize
-        )
-    }
-}
-
-extension NSFont.Weight: Codable {
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(self.rawValue)
-    }
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        let rawValue = try container.decode(CGFloat.self)
-        self = NSFont.Weight(rawValue: rawValue)
-    }
-}