FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tagBuf -> tag

This commit is contained in:
Nate Weaver 2020-04-26 11:11:50 -05:00
parent bdd5796a10
commit e8d39ded0d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shared/Extensions/NSAttributedString+NetNewsWire.swift
View File

@ -174,7 +174,7 @@ extension NSAttributedString {
let baseFont = font ?? Font.systemFont(ofSize: Font.systemFontSize) let baseFont = font ?? Font.systemFont(ofSize: Font.systemFontSize)
var inTag: InTag = .none var inTag: InTag = .none
var tagBuf = "" var tag = ""
var tagStack = [String]() var tagStack = [String]()
var currentStyles = CountedSet<Style>() var currentStyles = CountedSet<Style>()
@ -186,7 +186,7 @@ extension NSAttributedString {
while let char = iterator.next() { while let char = iterator.next() {
if char == "<" && inTag == .none { if char == "<" && inTag == .none {
tagBuf.removeAll() tag.removeAll()
guard let first = iterator.next() else { break } guard let first = iterator.next() else { break }
@ -194,13 +194,13 @@ extension NSAttributedString {
inTag = .closing inTag = .closing
} else { } else {
inTag = .opening inTag = .opening
tagBuf.append(first) tag.append(first)
} }
} else if char == ">" && inTag != .none { } else if char == ">" && inTag != .none {
if inTag == .opening { if inTag == .opening {
tagStack.append(tagBuf) tagStack.append(tag)
if tagBuf == "q" { if tag == "q" {
result.mutableString.append(locale.quotationBeginDelimiter ?? "\"") result.mutableString.append(locale.quotationBeginDelimiter ?? "\"")
} }
@ -208,7 +208,7 @@ extension NSAttributedString {
let location = lastRange != nil ? lastRange!.location + lastRange!.length : 0 let location = lastRange != nil ? lastRange!.location + lastRange!.length : 0
let range = NSRange(location: location, length: result.mutableString.length - location) let range = NSRange(location: location, length: result.mutableString.length - location)
let style = Style(tag: tagBuf) let style = Style(tag: tag)
attributeRanges.append( (range: range, styles: currentStyles) ) attributeRanges.append( (range: range, styles: currentStyles) )
@ -218,7 +218,7 @@ extension NSAttributedString {
} else { } else {
if tagBuf == "q" { if tag == "q" {
result.mutableString.append(locale.quotationEndDelimiter ?? "\"") result.mutableString.append(locale.quotationEndDelimiter ?? "\"")
} }
@ -228,7 +228,7 @@ extension NSAttributedString {
attributeRanges.append( ( range: range, styles: currentStyles )) attributeRanges.append( ( range: range, styles: currentStyles ))
if let style = Style(tag: tagBuf) { if let style = Style(tag: tag) {
currentStyles.remove(style) currentStyles.remove(style)
} }
@ -237,7 +237,7 @@ extension NSAttributedString {
inTag = .none inTag = .none
} else if inTag != .none { } else if inTag != .none {
tagBuf.append(char) tag.append(char)
} else { } else {
if char == "&" { if char == "&" {
var entity = "&" var entity = "&"