Move URLUtils to EditorCore

CotEditor/Sources/AppleScript.swift

@@ -25,6 +25,7 @@
 
 import Foundation
 import Shortcut
+import URLUtils
 
 struct AppleScript: EventScript {
 

CotEditor/Sources/CommandLineToolManager.swift

@@ -24,6 +24,7 @@
 //
 
 import Foundation
+import URLUtils
 
 final class CommandLineToolManager: Sendable {
 

CotEditor/Sources/DirectoryDocument.swift

@@ -27,6 +27,7 @@ import AppKit
 import Observation
 import UniformTypeIdentifiers
 import OSLog
+import URLUtils
 
 @Observable final class DirectoryDocument: NSDocument {
 

CotEditor/Sources/Document.swift

@@ -35,6 +35,7 @@ import FileEncoding
 import FilePermissions
 import LineEnding
 import Syntax
+import URLUtils
 
 extension Document: EditorSource {
 

CotEditor/Sources/DocumentWindowController.swift

@@ -29,6 +29,7 @@ import Combine
 import SwiftUI
 import Defaults
 import ControlUI
+import URLUtils
 
 final class DocumentWindowController: NSWindowController, NSWindowDelegate {
 

CotEditor/Sources/FileBrowserView.swift

@@ -28,6 +28,7 @@ import AppKit
 import UniformTypeIdentifiers
 import AudioToolbox
 import Defaults
+import URLUtils
 
 struct FileBrowserView: View {
 

CotEditor/Sources/KeyBindingManager.swift

@@ -26,6 +26,7 @@
 
 import AppKit
 import Shortcut
+import URLUtils
 
 @MainActor final class KeyBindingManager {
 

CotEditor/Sources/MultipleReplaceListViewController.swift

@@ -30,6 +30,7 @@ import UniformTypeIdentifiers
 import OSLog
 import Defaults
 import TextFind
+import URLUtils
 
 final class MultipleReplaceListViewController: NSViewController, NSMenuItemValidation {
 

CotEditor/Sources/PrintTextView.swift

@@ -26,6 +26,7 @@
 
 import AppKit
 import Defaults
+import URLUtils
 
 final class PrintTextView: NSTextView {
 

CotEditor/Sources/ReplacementManager.swift

@@ -27,6 +27,7 @@ import Foundation
 import Observation
 import TextFind
 import UniformTypeIdentifiers
+import URLUtils
 
 @Observable final class ReplacementManager: SettingFileManaging {
 

CotEditor/Sources/ScriptManager.swift

@@ -27,6 +27,7 @@
 import AppKit
 import Combine
 import Shortcut
+import URLUtils
 
 // NSObject-based NSAppleEventDescriptor must be used but not sendable
 // -> According to the documentation, NSAppleEventDescriptor is just a wrapper of AEDesc,

CotEditor/Sources/SettingFileManaging.swift

@@ -26,6 +26,7 @@
 import Foundation
 import UniformTypeIdentifiers
 import AppKit.NSApplication
+import URLUtils
 
 enum SettingChange {
 
@@ -74,6 +75,21 @@ extension NSNotification.Name {
 }
 
 
+extension URL {
+
+    /// Returns the URL for the given subdirectory in the application support directory in the user domain.
+    ///
+    /// - Parameter subDirectory: The name of the subdirectory in the application support.
+    /// - Returns: A directory URL.
+    static func applicationSupportDirectory(component subDirectory: String) -> URL {
+
+        .applicationSupportDirectory
+        .appending(component: "CotEditor", directoryHint: .isDirectory)
+        .appending(component: subDirectory, directoryHint: .isDirectory)
+    }
+}
+
+
 
 // MARK: -
 

CotEditor/Sources/SnippetManager.swift

@@ -28,6 +28,7 @@ import Foundation
 import AppKit.NSMenuItem
 import Defaults
 import Shortcut
+import URLUtils
 
 @MainActor @objc protocol SnippetInsertable: AnyObject {
 

CotEditor/Sources/SyntaxListViewController.swift

@@ -31,6 +31,7 @@ import SwiftUI
 import Syntax
 import UniformTypeIdentifiers
 import Defaults
+import URLUtils
 
 final class SyntaxListViewController: NSViewController, NSMenuItemValidation, NSTableViewDelegate, NSTableViewDataSource, NSFilePromiseProviderDelegate {
 

CotEditor/Sources/SyntaxManager.swift

@@ -31,6 +31,7 @@ import Yams
 import Defaults
 import Syntax
 import SyntaxMap
+import URLUtils
 
 enum SyntaxName {
 

CotEditor/Sources/ThemeListViewController.swift

@@ -29,6 +29,7 @@ import AudioToolbox
 import Combine
 import SwiftUI
 import UniformTypeIdentifiers
+import URLUtils
 
 final class ThemeListViewController: NSViewController, NSMenuItemValidation, NSTableViewDelegate, NSTableViewDataSource, NSFilePromiseProviderDelegate, NSTextFieldDelegate {
 

CotEditor/Sources/ThemeManager.swift

@@ -28,6 +28,7 @@ import Combine
 import Foundation
 import UniformTypeIdentifiers
 import Defaults
+import URLUtils
 
 final class ThemeManager: SettingFileManaging {
 

CotEditor/Sources/UTType.swift

@@ -27,6 +27,7 @@ import UniformTypeIdentifiers
 
 extension UTType {
 
+    /// All filename extensions.
     var filenameExtensions: [String] {
 
         self.tags[.filenameExtension] ?? []

CotEditor/Sources/UnixScript.swift

@@ -27,6 +27,7 @@
 import Foundation
 import AppKit.NSDocument
 import Shortcut
+import URLUtils
 
 struct UnixScript: Script {
 

Packages/EditorCore/Package.swift

@@ -16,6 +16,7 @@ let package = Package(
             "EditedRangeSet",
             "FileEncoding",
             "FilePermissions",
+            "URLUtils",
             "FuzzyRange",
             "Invisible",
             "LineEnding",
@@ -34,6 +35,7 @@ let package = Package(
         .library(name: "EditedRangeSet", targets: ["EditedRangeSet"]),
         .library(name: "FileEncoding", targets: ["FileEncoding"]),
         .library(name: "FilePermissions", targets: ["FilePermissions"]),
+        .library(name: "URLUtils", targets: ["URLUtils"]),
         .library(name: "FuzzyRange", targets: ["FuzzyRange"]),
         .library(name: "Invisible", targets: ["Invisible"]),
         .library(name: "LineEnding", targets: ["LineEnding"]),
@@ -64,6 +66,9 @@ let package = Package(
         .target(name: "FilePermissions"),
         .testTarget(name: "FilePermissionsTests", dependencies: ["FilePermissions"]),
 
+        .target(name: "URLUtils"),
+        .testTarget(name: "URLUtilsTests", dependencies: ["URLUtils"]),
+
         .target(name: "FuzzyRange"),
         .testTarget(name: "FuzzyRangeTests", dependencies: ["FuzzyRange"]),
 

CotEditor/Sources/String+Filename.swift → Packages/EditorCore/Sources/URLUtils/String+Filename.swift

@@ -1,5 +1,6 @@
 //
 //  String+Filename.swift
+//  URLUtils
 //
 //  CotEditor
 //  https://coteditor.com
@@ -25,7 +26,7 @@
 
 import Foundation
 
-extension String {
+public extension String {
 
     /// The remainder of string after last dot removed.
     var deletingPathExtension: String {
@@ -35,7 +36,7 @@ extension String {
 }
 
 
-extension Collection<String> {
+public extension Collection<String> {
 
     /// Creates a unique name from the receiver's elements by adding the suffix and also a number if needed.
     ///
@@ -50,13 +51,14 @@ extension Collection<String> {
         let (rootName, baseCount): (String, Int?) = {
             let suffixPattern = NSRegularExpression.escapedPattern(for: spaceSuffix)
             let regex = try! NSRegularExpression(pattern: suffixPattern + "(?: ([0-9]+))?$")
+            let range = NSRange(location: 0, length: proposedName.utf16.count)
 
-            guard let result = regex.firstMatch(in: proposedName, range: proposedName.nsRange) else { return (proposedName, nil) }
+            guard let result = regex.firstMatch(in: proposedName, range: range) else { return (proposedName, nil) }
 
             let root = (proposedName as NSString).substring(to: result.range.location)
             let numberRange = result.range(at: 1)
 
-            guard !numberRange.isNotFound else { return (root, nil) }
+            guard numberRange.location != NSNotFound else { return (root, nil) }
 
             let number = Int((proposedName as NSString).substring(with: numberRange))
 

CotEditor/Sources/URL+ExtendedAttribute.swift → Packages/EditorCore/Sources/URLUtils/URL+ExtendedAttribute.swift

@@ -1,5 +1,6 @@
 //
 //  URL+ExtendedAttribute.swift
+//  URLUtils
 //
 //  CotEditor
 //  https://coteditor.com
@@ -25,7 +26,7 @@
 
 import Foundation
 
-extension URL {
+public extension URL {
 
     /// Gets extended attribute.
     ///

CotEditor/Sources/URL.swift → Packages/EditorCore/Sources/URLUtils/URL.swift

@@ -1,5 +1,6 @@
 //
 //  URL.swift
+//  URLUtils
 //
 //  CotEditor
 //  https://coteditor.com
@@ -25,7 +26,7 @@
 
 import Foundation
 
-extension URL {
+public extension URL {
 
     /// Simply checks the reachability of the URL by ignoring errors.
     var isReachable: Bool {
@@ -109,7 +110,7 @@ extension URL {
 
 // MARK: User Domain
 
-extension URL {
+public extension URL {
 
     /// A temporary URL in the user domain for file replacement.
     static var itemReplacementDirectory: URL {
@@ -118,22 +119,10 @@ extension URL {
             try URL(for: .itemReplacementDirectory, in: .userDomainMask, appropriateFor: .userDirectory, create: true)
         }
     }
-
-
-    /// Returns the URL for the given subdirectory in the application support directory in the user domain.
-    ///
-    /// - Parameter subDirectory: The name of the subdirectory in the application support.
-    /// - Returns: A directory URL.
-    static func applicationSupportDirectory(component subDirectory: String) -> URL {
-
-        .applicationSupportDirectory
-        .appending(component: "CotEditor", directoryHint: .isDirectory)
-        .appending(component: subDirectory, directoryHint: .isDirectory)
-    }
 }
 
 
-extension FileManager {
+public extension FileManager {
 
     /// Creates intermediate directories to the given URL if not available.
     ///
@@ -147,7 +136,7 @@ extension FileManager {
 
 // MARK: Sandboxing
 
-extension URL {
+public extension URL {
 
     private static let homeDirectory = getpwuid(getuid())?.pointee.pw_dir.flatMap { String(cString: $0) } ?? NSHomeDirectory()
 

Tests/StringFilenameTests.swift → Packages/EditorCore/Tests/URLUtilsTests/StringFilenameTests.swift

@@ -1,6 +1,6 @@
 //
 //  StringFilename.swift
-//  Tests
+//  URLUtilsTests
 //
 //  CotEditor
 //  https://coteditor.com
@@ -25,7 +25,7 @@
 //
 
 import Testing
-@testable import CotEditor
+@testable import URLUtils
 
 struct StringFilename {
 

Tests/URLExtensionsTests.swift → Packages/EditorCore/Tests/URLUtilsTests/URLExtensionsTests.swift

@@ -1,6 +1,6 @@
 //
 //  URLExtensionsTests.swift
-//  Tests
+//  URLUtilsTests
 //
 //  CotEditor
 //  https://coteditor.com
@@ -26,7 +26,7 @@
 
 import Foundation
 import Testing
-@testable import CotEditor
+@testable import URLUtils
 
 struct URLExtensionsTests {