shadowfacts/splash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed whitespace

Browse Source
This commit is contained in:
Mihael Cholakov 2018-08-25 23:36:19 +03:00
parent d57b233f3e
commit 3952b91e3f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/Splash/Output/AttributedStringOutputFormat.swift
View File

@ -21,7 +21,7 @@ public struct AttributedStringOutputFormat: OutputFormat {
public init(theme: Theme) { public init(theme: Theme) {
self.theme = theme self.theme = theme
} }
public func makeBuilder() -> Builder { public func makeBuilder() -> Builder {
return Builder(theme: theme) return Builder(theme: theme)
} }
@ -32,25 +32,25 @@ public extension AttributedStringOutputFormat {
private let theme: Theme private let theme: Theme
private lazy var font = loadFont() private lazy var font = loadFont()
private var string = NSMutableAttributedString() private var string = NSMutableAttributedString()
fileprivate init(theme: Theme) { fileprivate init(theme: Theme) {
self.theme = theme self.theme = theme
} }
public mutating func addToken(_ token: String, ofType type: TokenType) { public mutating func addToken(_ token: String, ofType type: TokenType) {
let color = theme.tokenColors[type] ?? Color(red: 1, green: 1, blue: 1) let color = theme.tokenColors[type] ?? Color(red: 1, green: 1, blue: 1)
string.append(token, font: font, color: color) string.append(token, font: font, color: color)
} }
public mutating func addPlainText(_ text: String) { public mutating func addPlainText(_ text: String) {
string.append(text, font: font, color: theme.plainTextColor) string.append(text, font: font, color: theme.plainTextColor)
} }
public mutating func addWhitespace(_ whitespace: String) { public mutating func addWhitespace(_ whitespace: String) {
let color = Color(red: 1, green: 1, blue: 1) let color = Color(red: 1, green: 1, blue: 1)
string.append(whitespace, font: font, color: color) string.append(whitespace, font: font, color: color)
} }
public func build() -> NSAttributedString { public func build() -> NSAttributedString {
return NSAttributedString(attributedString: string) return NSAttributedString(attributedString: string)
} }
@ -58,7 +58,7 @@ public extension AttributedStringOutputFormat {
#if os(macOS) #if os(macOS)
private mutating func loadFont() -> NSFont { private mutating func loadFont() -> NSFont {
let size = CGFloat(theme.font.size) let size = CGFloat(theme.font.size)
switch theme.font.resource { switch theme.font.resource {
case .system: case .system:
return .defaultFont(ofSize: size) return .defaultFont(ofSize: size)
@ -93,7 +93,7 @@ private extension NSMutableAttributedString {
blue: CGFloat(color.blue), blue: CGFloat(color.blue),
alpha: CGFloat(color.alpha) alpha: CGFloat(color.alpha)
) )
let attributedString = NSAttributedString(string: string, attributes: [ let attributedString = NSAttributedString(string: string, attributes: [
.foregroundColor: color, .foregroundColor: color,
.font: font .font: font
@ -111,19 +111,19 @@ private extension NSFont {
.cfurlposixPathStyle, .cfurlposixPathStyle,
false false
) )
guard let font = url.flatMap(CGDataProvider.init).flatMap(CGFont.init) else { guard let font = url.flatMap(CGDataProvider.init).flatMap(CGFont.init) else {
return nil return nil
} }
return CTFontCreateWithGraphicsFont(font, size, nil, nil) return CTFontCreateWithGraphicsFont(font, size, nil, nil)
} }
static func defaultFont(ofSize size: CGFloat) -> NSFont { static func defaultFont(ofSize size: CGFloat) -> NSFont {
guard let courier = loaded(from: "/Library/Fonts/Courier New.ttf", size: size) else { guard let courier = loaded(from: "/Library/Fonts/Courier New.ttf", size: size) else {
return .systemFont(ofSize: size) return .systemFont(ofSize: size)
} }
return courier return courier
} }
} }