GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-06-06 20:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround union not working on Linux on Swift 3.1

Browse Source
This commit is contained in:
Marcelo Fabri
2017-10-01 00:45:52 -03:00
parent e24d847596
commit ffa4e8a3fb
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SwiftLintFramework/Extensions/CharacterSet+LinuxHack.swift
+7 -4
View File
@@ -9,13 +9,16 @@
import Foundation
extension CharacterSet {
func isSuperset(ofCharactersIn string: String) -> Bool {
#if swift(>=4.0)
return isSuperset(of: CharacterSet(charactersIn: string))
func isSuperset(ofCharactersIn string: String,
union other: CharacterSet = CharacterSet()) -> Bool {
#if swift(>=3.2)
let set = union(other)
return set.isSuperset(of: CharacterSet(charactersIn: string))
#else
// workaround for https://bugs.swift.org/browse/SR-3485
return !Set(string.characters).contains { character in
!contains(String(character).unicodeScalars.first!)
let scalar = String(character).unicodeScalars.first!
return !contains(scalar) && !other.contains(scalar)
}
#endif
}
Source/SwiftLintFramework/Rules/GenericTypeNameRule.swift
+2 -2
View File
@@ -165,8 +165,8 @@ public struct GenericTypeNameRule: ASTRule, ConfigurationProviderRule {
return []
}
let allowedSymbols = configuration.allowedSymbols.union(.alphanumerics)
if !allowedSymbols.isSuperset(ofCharactersIn: name) {
let allowedSymbols = configuration.allowedSymbols
if !allowedSymbols.isSuperset(ofCharactersIn: name, union: .alphanumerics) {
return [
StyleViolation(ruleDescription: type(of: self).description,
severity: .error,
Source/SwiftLintFramework/Rules/IdentifierNameRule.swift
+2 -2
View File
@@ -48,8 +48,8 @@ public struct IdentifierNameRule: ASTRule, ConfigurationProviderRule {
let type = self.type(for: kind)
if !isFunction {
let allowedSymbols = configuration.allowedSymbols.union(.alphanumerics)
if !allowedSymbols.isSuperset(ofCharactersIn: name) {
let allowedSymbols = configuration.allowedSymbols
if !allowedSymbols.isSuperset(ofCharactersIn: name, union: .alphanumerics) {
return [
StyleViolation(ruleDescription: description,
severity: .error,
Source/SwiftLintFramework/Rules/TypeNameRule.swift
+2 -2
View File
@@ -75,8 +75,8 @@ public struct TypeNameRule: ASTRule, ConfigurationProviderRule {
}
let name = name.nameStrippingLeadingUnderscoreIfPrivate(dictionary)
let allowedSymbols = configuration.allowedSymbols.union(.alphanumerics)
if !allowedSymbols.isSuperset(ofCharactersIn: name) {
let allowedSymbols = configuration.allowedSymbols
if !allowedSymbols.isSuperset(ofCharactersIn: name, union: .alphanumerics) {
return [StyleViolation(ruleDescription: type(of: self).description,
severity: .error,
location: Location(file: file, byteOffset: offset),