[global] completely useless commit: remove tabs from empty lines

Author: kirb

NewTerm/Controllers/AppDelegate.swift

@@ -19,33 +19,33 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		let tintColor = UIColor(red: 76 / 255, green: 161 / 255, blue: 1, alpha: 1)
 		let backgroundColor = UIColor(white: 26 / 255, alpha: 1)
 		let lightTintColor = UIColor(white: 60 / 255, alpha: 1)
-		
+
 		UINavigationBar.appearance().barStyle = .black
 		UIToolbar.appearance().barStyle = .black
-		
+
 		UITableView.appearance().backgroundColor = backgroundColor
 		UITableViewCell.appearance().backgroundColor = backgroundColor
 		// this is deprecated but apple doesn’t exactly provide an easy, supported way to do this
 		// TODO: ew, swift doesn’t allow setting pre-ios 7 deprecated methods at all
 		// UITableViewCell.appearance().textColor = textColor
-		
+
 		UINavigationBar.appearance().titleTextAttributes = [
 			.foregroundColor: textColor
 		]
-		
+
 		UITextField.appearance().textColor = textColor
 		UITextField.appearance().keyboardAppearance = .dark
 		UITableView.appearance().separatorColor = lightTintColor
-		
+
 		UIScrollView.appearance().keyboardDismissMode = .interactive
-		
+
 		window = UIWindow(frame: UIScreen.main.bounds)
 		window!.tintColor = tintColor
 		window!.rootViewController = UINavigationController(rootViewController: RootViewController())
 		window!.makeKeyAndVisible()
-		
+
 		_ = Preferences.shared
-		
+
 		return true
 	}
 

NewTerm/Controllers/Preferences.swift

@@ -9,67 +9,67 @@
 import UIKit
 
 class Preferences {
-	
+
 	static let shared = Preferences()
-	
+
 	let preferences = UserDefaults.standard
-	
+
 	let fontsPlist = NSDictionary(contentsOf: Bundle.main.url(forResource: "Fonts", withExtension: "plist")!)!
 	let themesPlist = NSDictionary(contentsOf: Bundle.main.url(forResource: "Themes", withExtension: "plist")!)!
-	
+
 	var fontMetrics: FontMetrics!
 	var colorMap: VT100ColorMap!
-	
+
 	init() {
 		preferences.register(defaults: [
 			"fontName": "Fira Code",
 			"fontSize": 12,
 			"theme": "kirb"
 		])
-		
+
 		NotificationCenter.default.addObserver(self, selector: #selector(self.preferencesUpdated), name: UserDefaults.didChangeNotification, object: preferences)
 		preferencesUpdated()
 	}
-	
+
 	var fontName: String {
 		get { return preferences.object(forKey: "fontName") as! String }
 	}
-	
+
 	var fontSize: CGFloat {
 		get { return preferences.object(forKey: "fontSize") as! CGFloat }
 	}
-	
+
 	var themeName: String {
 		get { return preferences.object(forKey: "theme") as! String }
 	}
-	
+
 	// MARK: - Callbacks
-	
+
 	@objc private func preferencesUpdated() {
 		fontMetricsChanged()
 		colorMapChanged()
 	}
-	
+
 	private func fontMetricsChanged() {
 		var regularFont: UIFont?
 		var boldFont: UIFont?
-		
+
 		if let family = fontsPlist[fontName] as? [String: String] {
 			if family["Regular"] != nil && family["Bold"] != nil {
 				regularFont = UIFont(name: family["Regular"]!, size: fontSize)
 				boldFont = UIFont(name: family["Bold"]!, size: fontSize)
 			}
 		}
-		
+
 		if regularFont == nil || boldFont == nil {
 			NSLog("font %@ size %f could not be initialised", fontName, fontSize)
 			preferences.set("Courier", forKey: "fontName")
 			return
 		}
-		
+
 		fontMetrics = FontMetrics(font: regularFont, boldFont: boldFont)
 	}
-	
+
 	func colorMapChanged() {
 		// if the theme doesn’t exist… how did we get here? force it to the default, which will call
 		// this method again
@@ -78,9 +78,9 @@ class Preferences {
 			preferences.set("kirb", forKey: "theme")
 			return
 		}
-	
+
 		colorMap = VT100ColorMap(dictionary: theme)
 	}
-	
+
 }
 

NewTerm/Controllers/SubProcess.swift

@@ -24,13 +24,13 @@ protocol SubProcessDelegate: NSObjectProtocol {
 	func subProcess(didReceiveData data: Data)
 	func subProcess(didDisconnectWithError error: Error?)
 	func subProcess(didReceiveError error: Error)
-	
+
 }
 
 class SubProcess: NSObject {
 
 	private static let newlineData = Data(bytes: "\r\n", count: 2)
-	
+
 	// Simply used to initialize the terminal and thrown away after startup.
 	private static let defaultWidth: UInt16 = 80
 	private static let defaultHeight: UInt16 = 25
@@ -40,7 +40,7 @@ class SubProcess: NSObject {
 	private var childPID: pid_t?
 	private var fileDescriptor: Int32?
 	public var fileHandle: FileHandle?
-	
+
 	var screenSize: ScreenSize = ScreenSize() {
 		didSet {
 			if fileDescriptor == nil {
@@ -80,7 +80,7 @@ class SubProcess: NSObject {
 					NSLog("fork failed: %d: %s", errno, strerror(errno))
 					throw SubProcessIllegalStateError.forkFailed
 				}
-				
+
 			case 0:
 				// Handle the child subprocess. First try to use /bin/login since it’s a little nicer. Fall
 				// back to /bin/bash if that is available.
@@ -97,7 +97,7 @@ class SubProcess: NSObject {
 				_ = attemptStartProcess(path: "/bin/sh", arguments: shArgs, environment: env)
 				_ = attemptStartProcess(path: "/bootstrap/bin/bash", arguments: shArgs, environment: env)
 				break
-			
+
 			default:
 				NSLog("process forked: %d", pid)
 				childPID = pid
@@ -154,7 +154,7 @@ class SubProcess: NSObject {
 		if !fileManager.fileExists(atPath: path) {
 			return -1
 		}
-		
+
 		// Notably, we don't test group or other bits so this still might not always
 		// notice if the binary is not executable by us.
 		if !fileManager.isExecutableFile(atPath: path) {

NewTerm/Controllers/TerminalController.swift

@@ -9,37 +9,37 @@
 import UIKit
 
 protocol TerminalControllerDelegate {
-	
+
 	func refresh(attributedString: NSAttributedString, backgroundColor: UIColor)
 	func activateBell()
 	func close()
 	func didReceiveError(error: Error)
-	
+
 	func openSettings()
-	
+
 }
 
 class TerminalController: VT100 {
-	
+
 	var delegate: TerminalControllerDelegate?
-	
+
 	private var updateQueue: DispatchQueue!
-	
+
 	private var stringSupplier = VT100StringSupplier()
-	
+
 	var colorMap: VT100ColorMap {
 		get { return stringSupplier.colorMap! }
 		set { stringSupplier.colorMap = newValue }
 	}
-	
+
 	var fontMetrics: FontMetrics {
 		get { return stringSupplier.fontMetrics! }
 		set { stringSupplier.fontMetrics = newValue }
 	}
-	
+
 	private var subProcess: SubProcess?
 	private var processEnded: Bool = false
-	
+
 	override var screenSize: ScreenSize {
 		get { return super.screenSize }
 
@@ -52,45 +52,45 @@ class TerminalController: VT100 {
 			subProcess?.screenSize = screenSize
 		}
 	}
-	
+
 	override init() {
 		super.init()
-		
+
 		updateQueue = DispatchQueue(label: String(format: "au.com.hbang.NewTerm.update-queue-%p", self))
-		
+
 		stringSupplier.screenBuffer = self
-		
+
 		NotificationCenter.default.addObserver(self, selector: #selector(self.preferencesUpdated), name: UserDefaults.didChangeNotification, object: nil)
 		preferencesUpdated()
 	}
-	
+
 	@objc func preferencesUpdated() {
 		let preferences = Preferences.shared
 		stringSupplier.colorMap = preferences.colorMap
 		stringSupplier.fontMetrics = preferences.fontMetrics
-		
+
 		refresh()
 	}
-	
+
 	// MARK: - Sub Process
-	
+
 	func startSubProcess() throws {
 		processEnded = false
-		
+
 		subProcess = SubProcess()
 		subProcess!.delegate = self
 		try subProcess!.start()
 	}
-	
+
 	func stopSubProcess() throws {
 		processEnded = true
 		try subProcess!.stop()
 	}
-	
+
 }
 
 extension TerminalController: TerminalInputProtocol {
-	
+
 	func receiveKeyboardInput(data: Data) {
 		if processEnded {
 			// we’ve told the user that pressing a key will close the tab, so close the tab
@@ -104,68 +104,68 @@ extension TerminalController: TerminalInputProtocol {
 	func openSettings() {
 		delegate!.openSettings()
 	}
-	
+
 }
 
 // ScreenBufferRefreshDelegate
 extension TerminalController {
-	
+
 	override func refresh() {
 		super.refresh()
-		
+
 		// TODO: this is called due to -[VT100 init], and we aren’t ready yet… we’ll be called when we
 		// are anyway, so don’t worry about it
 		if updateQueue == nil {
 			return
 		}
-		
+
 		// TODO: we should handle the scrollback separately so it only appears if the user scrolls
 		updateQueue.async {
 			let attributedString = self.stringSupplier.attributedString()!
 			let backgroundColor = self.stringSupplier.colorMap!.background!
-			
+
 			DispatchQueue.main.async {
 				self.delegate?.refresh(attributedString: attributedString, backgroundColor: backgroundColor)
 			}
 		}
 	}
-	
+
 	override func activateBell() {
 		super.activateBell()
 		delegate?.activateBell()
 	}
-	
+
 }
 
 extension TerminalController: SubProcessDelegate {
-	
+
 	func subProcessDidConnect() {
 		// yay
 	}
-	
+
 	func subProcess(didReceiveData data: Data) {
 		// Simply forward the input stream down the VT100 processor. When it notices changes to the
 		// screen, it should invoke our refresh delegate below.
 		readInputStream(data)
 	}
-	
+
 	func subProcess(didDisconnectWithError error: Error?) {
 		// we have nothing useful to do if the process has already ended
 		if processEnded {
 			return
 		}
-		
+
 		processEnded = true
 
 		// show a message inside the terminal indicating that the session has ended, and that the user
 		// can press any key to close the tab
 		let message = "[\(NSLocalizedString("PROCESS_COMPLETED_TITLE", comment: ""))]\r\n\(NSLocalizedString("PROCESS_COMPLETED_MESSAGE", comment: ""))"
 		readInputStream(message.data(using: .utf8))
 	}
-	
+
 	func subProcess(didReceiveError error: Error) {
 		NSLog("subprocess received error… %@", error as NSError)
 		delegate?.didReceiveError(error: error)
 	}
-	
+
 }

NewTerm/Global.swift

@@ -12,7 +12,7 @@ let isBigDevice: Bool = {
 	switch UIDevice.current.userInterfaceIdiom {
 	case .phone, .carPlay, .unspecified:
 		return false
-	
+
 	case .pad, .tv:
 		return true
 	}