Swift 4 version #4
Conversation
|
Thanks a lot @Mort3m ! This will be merged as soon as the GM Seed comes out. For the meantime you can fix the remaining issues with indentation. As stated in the |
alehed
left a comment
alehed
left a comment
There was a problem hiding this comment.
I can't see if the whitespace diff is from using tabs instead of spaces or just indenting with one space less than usual.
SyntaxKit/AttributedParser.swift
Outdated
|
|
||
| open func attributedString(for string: String, base: Attributes? = nil) -> NSAttributedString { | ||
| let output = NSMutableAttributedString(string: string, attributes: base) | ||
| let output = NSMutableAttributedString(string: string, attributes: base) |
There was a problem hiding this comment.
This should be 8 spaces instead of seven.
SyntaxKit/Parser.swift
Outdated
| continue | ||
| } | ||
| let range = result.rangeAt(Int(index)) | ||
| let range = result.range(at: Int(index)) |
SyntaxKit/Theme.swift
Outdated
|
|
||
| if let value = setting.removeValue(forKey: "foreground") as? String { | ||
| setting[NSForegroundColorAttributeName] = Color(hex: value) | ||
| if let value = setting.removeValue(forKey: NSAttributedStringKey(rawValue: "foreground")) as? String { |
SyntaxKit/Theme.swift
Outdated
|
|
||
| public var backgroundColor: Color { | ||
| return attributes[Language.globalScope]?[NSBackgroundColorAttributeName] as? Color ?? Color.white | ||
| return attributes[Language.globalScope]?[NSAttributedStringKey.backgroundColor] as? Color ?? Color.white |
SyntaxKit/Theme.swift
Outdated
|
|
||
| public var foregroundColor: Color { | ||
| return attributes[Language.globalScope]?[NSForegroundColorAttributeName] as? Color ?? Color.black | ||
| return attributes[Language.globalScope]?[NSAttributedStringKey.foregroundColor] as? Color ?? Color.black |
SyntaxKit/Theme.swift
Outdated
|
|
||
| if let value = setting.removeValue(forKey: "background") as? String { | ||
| setting[NSBackgroundColorAttributeName] = Color(hex: value) | ||
| if let value = setting.removeValue(forKey: NSAttributedStringKey(rawValue: "background")) as? String { |
|
Alright @alehed, I will take care of it! |
alehed
left a comment
alehed
left a comment
There was a problem hiding this comment.
Two more lines still contain tabs (53 and 57).
|
Great, thanks! As mentioned, this will be merged as soon as the GM Seed is released by Apple, which is probably going to happen sometime in September. Unfortunately, there is currently no editor-config plugin that works in Xcode… |
|
@Mort3m Thanks a lot for the contribution! 👍 |
2 participants
Migrated to Swift 4 for a new project.
Thought it might be useful some others as well.
Thanks a lot for you contributions & fixes @alehed!