Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add caching of Structure and SyntaxMap. #37

Merged
merged 1 commit into from
May 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
with examples.
[Chris Eidhof](https://github.com/chriseidhof)

* Cache parsing to reduce execution time by more than 50%.
[Nikolaj Schumacher](https://github.com/nschum)

##### Bug Fixes

None.
Expand Down
48 changes: 48 additions & 0 deletions Source/SwiftLintFramework/File+Cache.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import SourceKittenFramework

private var structureCache = Cache({file in Structure(file: file)})
private var syntaxMapCache = Cache({file in SyntaxMap(file: file)})

private struct Cache<T> {

private var values = [String: T]()
private var factory: File -> T

private init(_ factory: File -> T) {
self.factory = factory
}

private mutating func get(file: File) -> T {
if let path = file.path {
if let value = values[path] {
return value
} else {
let value = factory(file)
values[path] = value
return value
}
} else {
return factory(file)
}
}

private mutating func clear() {
values.removeAll(keepCapacity: false)
}
}

public extension File {

public var structure: Structure {
return structureCache.get(self)
}

public var syntaxMap: SyntaxMap {
return syntaxMapCache.get(self)
}

public static func clearCaches() {
structureCache.clear()
syntaxMapCache.clear()
}
}
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/File+SwiftLint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extension File {
[NSRange] {
return flatMap(NSRegularExpression(pattern: pattern, options: nil, error: nil)) { regex in
let range = NSRange(location: 0, length: count(self.contents.utf16))
let syntax = SyntaxMap(file: self)
let syntax = self.syntaxMap
let matches = regex.matchesInString(self.contents, options: nil, range: range)
return map(matches as? [NSTextCheckingResult]) { matches in
return compact(matches.map { match in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public struct FunctionBodyLengthRule: ASTRule, ParameterizedRule {
]

public func validateFile(file: File) -> [StyleViolation] {
return validateFile(file, dictionary: Structure(file: file).dictionary)
return validateFile(file, dictionary: file.structure.dictionary)
}

public func validateFile(file: File, dictionary: XPCDictionary) -> [StyleViolation] {
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/NestingRule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public struct NestingRule: ASTRule {
public let identifier = "nesting"

public func validateFile(file: File) -> [StyleViolation] {
return validateFile(file, dictionary: Structure(file: file).dictionary)
return validateFile(file, dictionary: file.structure.dictionary)
}

public func validateFile(file: File, dictionary: XPCDictionary) -> [StyleViolation] {
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public struct TypeBodyLengthRule: ASTRule, ParameterizedRule {
]

public func validateFile(file: File) -> [StyleViolation] {
return validateFile(file, dictionary: Structure(file: file).dictionary)
return validateFile(file, dictionary: file.structure.dictionary)
}

public func validateFile(file: File, dictionary: XPCDictionary) -> [StyleViolation] {
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/TypeNameRule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public struct TypeNameRule: ASTRule {
public let identifier = "type_name"

public func validateFile(file: File) -> [StyleViolation] {
return validateFile(file, dictionary: Structure(file: file).dictionary)
return validateFile(file, dictionary: file.structure.dictionary)
}

public func validateFile(file: File, dictionary: XPCDictionary) -> [StyleViolation] {
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Rules/VariableNameRule.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public struct VariableNameRule: ASTRule {
public let identifier = "variable_name"

public func validateFile(file: File) -> [StyleViolation] {
return validateFile(file, dictionary: Structure(file: file).dictionary)
return validateFile(file, dictionary: file.structure.dictionary)
}

public func validateFile(file: File, dictionary: XPCDictionary) -> [StyleViolation] {
Expand Down
4 changes: 4 additions & 0 deletions SwiftLint.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
24E17F721B14BB3F008195BE /* File+Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E17F701B1481FF008195BE /* File+Cache.swift */; };
83894F221B0C928A006214E1 /* RulesCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83894F211B0C928A006214E1 /* RulesCommand.swift */; };
83D71E281B131ECE000395DE /* RuleExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83D71E261B131EB5000395DE /* RuleExample.swift */; };
83D71E2B1B131EED000395DE /* AnsiCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83D71E231B131C11000395DE /* AnsiCode.swift */; };
Expand Down Expand Up @@ -102,6 +103,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
24E17F701B1481FF008195BE /* File+Cache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "File+Cache.swift"; sourceTree = "<group>"; };
5499CA961A2394B700783309 /* Components.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Components.plist; sourceTree = "<group>"; };
5499CA971A2394B700783309 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
83894F211B0C928A006214E1 /* RulesCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulesCommand.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -328,6 +330,7 @@
children = (
E88DEA8B1B0999A000A66CB0 /* ASTRule.swift */,
E88DEA741B09852000A66CB0 /* File+SwiftLint.swift */,
24E17F701B1481FF008195BE /* File+Cache.swift */,
E812249B1B04FADC001783D2 /* Linter.swift */,
E88DEA6E1B09843F00A66CB0 /* Location.swift */,
E88DEA761B098D0C00A66CB0 /* Rule.swift */,
Expand Down Expand Up @@ -565,6 +568,7 @@
E88DEA841B0990F500A66CB0 /* ColonRule.swift in Sources */,
E88DEA791B098D4400A66CB0 /* RuleParameter.swift in Sources */,
E88DEA731B0984C400A66CB0 /* String+SwiftLint.swift in Sources */,
24E17F721B14BB3F008195BE /* File+Cache.swift in Sources */,
E88DEA6D1B09842200A66CB0 /* StyleViolationType.swift in Sources */,
E88DEA941B099C0900A66CB0 /* VariableNameRule.swift in Sources */,
E88DEA8A1B0992B300A66CB0 /* FileLengthRule.swift in Sources */,
Expand Down