From 6f7214ff383d336511df32543275fd94ec8e955c Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 15 Feb 2019 21:10:58 +0100 Subject: ConfTextStorage: lowercase only once Also fix submodule regression. Signed-off-by: Jason A. Donenfeld --- WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'WireGuard/WireGuard/UI/macOS/View') diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift index caa2bc4..077ee1e 100644 --- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift +++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift @@ -100,14 +100,13 @@ class ConfTextStorage: NSTextStorage { resetLastPeer() while spans.pointee.type != HighlightEnd { let span = spans.pointee - var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string + var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string.lowercased() if span.type == HighlightError { resetLastPeer() return - } - if span.type == HighlightSection { - if substring.lowercased() == "[peer]" { + } else if span.type == HighlightSection { + if substring == "[peer]" { if hasOnePeer { resetLastPeer() return @@ -115,7 +114,7 @@ class ConfTextStorage: NSTextStorage { hasOnePeer = true } } else if span.type == HighlightField { - fieldType = FieldType(rawValue: substring.lowercased()) + fieldType = FieldType(rawValue: substring) } else if span.type == HighlightIP && fieldType == .dns { lastOnePeerDNSServers.append(substring) } else if span.type == HighlightIP && fieldType == .allowedips { -- cgit v1.2.3-59-g8ed1b