From 58d40869da42f17efc25de9e72be9f8ff449897e Mon Sep 17 00:00:00 2001 From: Yuya Tanaka Date: Wed, 6 Apr 2016 18:23:39 +0900 Subject: [PATCH] Do not create temporary directory --- SwiftLintXcode/Formatter.swift | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/SwiftLintXcode/Formatter.swift b/SwiftLintXcode/Formatter.swift index c5d7316..2de43a8 100644 --- a/SwiftLintXcode/Formatter.swift +++ b/SwiftLintXcode/Formatter.swift @@ -13,15 +13,13 @@ final class Formatter { static var sharedInstance = Formatter() private static let pathExtension = "SwiftLintXcode" - let fileManager = NSFileManager.defaultManager() - let tempDirURL: NSURL = NSURL(fileURLWithPath: NSTemporaryDirectory()).URLByAppendingPathComponent("SwiftLintXcode-\(NSUUID().UUIDString)") + private let fileManager = NSFileManager.defaultManager() - struct CursorPosition { + private struct CursorPosition { let line: Int let column: Int } - class func isFormattableDocument(document: NSDocument) -> Bool { return (document.fileURL?.pathExtension?.lowercaseString == "swift") ?? false } @@ -123,7 +121,6 @@ final class Formatter { } private func withTempporaryFile(@noescape callback: (filePath: String) throws -> T) throws -> T { - try ensureTemporaryDirectory() let filePath = createTemporaryPath() if fileManager.fileExistsAtPath(filePath) { throw NSError(domain: "net.ypresto.SwiftLintXcode", code: 0, userInfo: [ @@ -135,11 +132,7 @@ final class Formatter { } private func createTemporaryPath() -> String { - return tempDirURL.URLByAppendingPathComponent(NSUUID().UUIDString).path! + ".swift" - } - - private func ensureTemporaryDirectory() throws { - if fileManager.fileExistsAtPath(tempDirURL.path!) { return } - try fileManager.createDirectoryAtURL(tempDirURL, withIntermediateDirectories: true, attributes: nil) + return NSURL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true) + .URLByAppendingPathComponent("SwiftLintXcode_\(NSUUID().UUIDString).swift").path! } }