soffes · alehed · Jan 1, 2016 · Jan 3, 2016 · Jan 3, 2016 · Jan 5, 2016
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,5 @@
+[*.swift]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Readme.markdown b/Readme.markdown
@@ -4,12 +4,12 @@
 
 SyntaxKit makes TextMate-style syntax highlighting easy. It works on iOS, watchOS, and OS X.
 
-SyntaxKit was abstracted from [Whiskey](http://usewhiskey.com).
+SyntaxKit was originally abstracted from [Whiskey](http://usewhiskey.com).
 
 
 ## Building
 
-SyntaxKit is written in Swift 2 so Xcode 7 is required. There aren't any dependencies besides system frameworks.
+SyntaxKit is written in Swift 3 so Xcode 8 is required. There aren't any dependencies besides system frameworks.
 
 
 ## Installation
@@ -35,19 +35,20 @@ SyntaxKit uses `tmLanguage` and `tmTheme` files to highlight source code. None a
 
 ### Basic Parsing
 
-Once you have a language, you can get started:
+Once you have a BundleManager, you can get started:
 
 ```swift
 import SyntaxKit
 
-let path = "path to your .tmLanguage file"
-let plist = NSDictionary(contentsOfFile: path)! as [NSObject: AnyObject]
-let yaml = Language(dictionary: plist)
+let manager = BundleManager() { identifier, isLanguage in
+    NSURL(string: "Location of Bundles/" + identifier + ".plist")
+}
+let yaml = manager.language(withIdentifier: "source.yaml")!
 
 let parser = Parser(language: yaml)
 ```
 
-`Parser` is a very simple class that just calls a block when it finds something the language file knows about. Let's print all of the elements in this string:
+`Parser` is a class that calls a block when it finds something the language file knows about. Let's print all of the elements in this string:
 
 ```swift
 let input = "title: \"Hello World\"\n"
@@ -64,24 +65,27 @@ parser.parse(input) { scope, range in
 SyntaxKit also comes with `AttributedParser`. This is a simple subclass of `Parser` that knows how to work with themes.
 
 ```swift
-let tomorrow = Theme(dictionary: themePlist)
+let tomorrow = manager.theme(withIdentifier: "tomorrow")!
 let attributedParser = AttributedParser(language: yaml, theme: tomorrow)
 
 attributedParser.parse(input) { scope, range, attributes in
     print("\(scope) - \(range) - \(attributes)")
 }
 ```
 
-Notice that `attributes` is the third paramenter to the block now. This is a dictionary of attributes you can give to `NSAttributedString`. Other values may be included here that don't work with `NSAttributedString`. You can do your own inspection and do something custom if you want.
+Notice that `attributes` is the third parameter to the block now. This is a dictionary of attributes you can give to `NSAttributedString`.
 
 `AttributedParser` includes a convenience method for turning a `String` of source code into an `NSAttributedString`:
 
 ```swift
-let attributedString = attributedParser.attributedStringForString(input)
+let attributedString = attributedParser.attributedString(for: input)
 ```
 
 Easy as that. This method takes an optional `baseAttributes` parameter to customize how the string is created. This is great if you want to specify a font, etc.
 
+### Parsing Operations
+
+There is also a `AttributedParsingOperation` subclass of NSOperation that facilitates multithreaded parsing.
 
 ### Custom Parsers
 

diff --git a/SyntaxKit.podspec b/SyntaxKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'SyntaxKit'
-  spec.version = '0.1.0'
+  spec.version = '1.0'
   spec.authors = {'Sam Soffes' => '[email protected]'}
   spec.homepage = 'https://github.com/soffes/SyntaxKit'
   spec.summary = 'TextMate-style syntax highlighting.'

diff --git a/SyntaxKit.xcodeproj/project.pbxproj b/SyntaxKit.xcodeproj/project.pbxproj
diff --git a/...cbaselines/211989AF1B2EC3B600F0D786.xcbaseline/36C0E679-EC89-495E-854F-FFBDEA1A4F58.plist b/...cbaselines/211989AF1B2EC3B600F0D786.xcbaseline/36C0E679-EC89-495E-854F-FFBDEA1A4F58.plist
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>classNames</key>
+	<dict>
+		<key>IncrementalParsingTests</key>
+		<dict>
+			<key>testPerformanceBeginEnd()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.003</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceEdgeCases()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.002</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceExample()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.002</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceInScope()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.002</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceSingleLine()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.003</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
+		<key>SwiftBaselineHighlightingTests</key>
+		<dict>
+			<key>testHighlightingPerformance()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.065</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/...cbaselines/211989AF1B2EC3B600F0D786.xcbaseline/39CEC1B4-ED87-4CDB-A7E7-9A4ED4F3BEC8.plist b/...cbaselines/211989AF1B2EC3B600F0D786.xcbaseline/39CEC1B4-ED87-4CDB-A7E7-9A4ED4F3BEC8.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>classNames</key>
+	<dict>
+		<key>IncrementalParsingTests</key>
+		<dict>
+			<key>testPerformanceEdgeCases()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.0023728</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceInScope()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.0030039</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
+		<key>SwiftBaselineHighlightingTests</key>
+		<dict>
+			<key>testHighlightingPerformance()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.085269</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/SyntaxKit.xcodeproj/xcshareddata/xcbaselines/211989AF1B2EC3B600F0D786.xcbaseline/Info.plist b/SyntaxKit.xcodeproj/xcshareddata/xcbaselines/211989AF1B2EC3B600F0D786.xcbaseline/Info.plist
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>runDestinationsByUUID</key>
+	<dict>
+		<key>36C0E679-EC89-495E-854F-FFBDEA1A4F58</key>
+		<dict>
+			<key>localComputer</key>
+			<dict>
+				<key>busSpeedInMHz</key>
+				<integer>100</integer>
+				<key>cpuCount</key>
+				<integer>1</integer>
+				<key>cpuKind</key>
+				<string>6-Core Intel Xeon E5</string>
+				<key>cpuSpeedInMHz</key>
+				<integer>3500</integer>
+				<key>logicalCPUCoresPerPackage</key>
+				<integer>12</integer>
+				<key>modelCode</key>
+				<string>MacPro6,1</string>
+				<key>physicalCPUCoresPerPackage</key>
+				<integer>6</integer>
+				<key>platformIdentifier</key>
+				<string>com.apple.platform.macosx</string>
+			</dict>
+			<key>targetArchitecture</key>
+			<string>i386</string>
+			<key>targetDevice</key>
+			<dict>
+				<key>modelCode</key>
+				<string>iPad2,1</string>
+				<key>platformIdentifier</key>
+				<string>com.apple.platform.iphonesimulator</string>
+			</dict>
+		</dict>
+		<key>39CEC1B4-ED87-4CDB-A7E7-9A4ED4F3BEC8</key>
+		<dict>
+			<key>localComputer</key>
+			<dict>
+				<key>busSpeedInMHz</key>
+				<integer>100</integer>
+				<key>cpuCount</key>
+				<integer>1</integer>
+				<key>cpuKind</key>
+				<string>6-Core Intel Xeon E5</string>
+				<key>cpuSpeedInMHz</key>
+				<integer>3500</integer>
+				<key>logicalCPUCoresPerPackage</key>
+				<integer>12</integer>
+				<key>modelCode</key>
+				<string>MacPro6,1</string>
+				<key>physicalCPUCoresPerPackage</key>
+				<integer>6</integer>
+				<key>platformIdentifier</key>
+				<string>com.apple.platform.macosx</string>
+			</dict>
+			<key>targetArchitecture</key>
+			<string>x86_64</string>
+			<key>targetDevice</key>
+			<dict>
+				<key>modelCode</key>
+				<string>iPhone8,2</string>
+				<key>platformIdentifier</key>
+				<string>com.apple.platform.iphonesimulator</string>
+			</dict>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-iOS.xcscheme b/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -80,15 +79,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "211989A61B2EC3B600F0D786"
-            BuildableName = "SyntaxKit.framework"
-            BlueprintName = "SyntaxKit-iOS"
-            ReferencedContainer = "container:SyntaxKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-macOS.xcscheme b/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-tvOS.xcscheme b/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "211826D91D257A71003F2BF2"
-               BuildableName = "SyntaxKit-tvOS.framework"
+               BuildableName = "SyntaxKit.framework"
                BlueprintName = "SyntaxKit-tvOS"
                ReferencedContainer = "container:SyntaxKit.xcodeproj">
             </BuildableReference>
@@ -33,7 +33,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "211826E21D257A71003F2BF2"
-               BuildableName = "SyntaxKitTests-tvOS.xctest"
+               BuildableName = "SyntaxKitTests.xctest"
                BlueprintName = "SyntaxKitTests-tvOS"
                ReferencedContainer = "container:SyntaxKit.xcodeproj">
             </BuildableReference>
@@ -43,7 +43,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "211826D91D257A71003F2BF2"
-            BuildableName = "SyntaxKit-tvOS.framework"
+            BuildableName = "SyntaxKit.framework"
             BlueprintName = "SyntaxKit-tvOS"
             ReferencedContainer = "container:SyntaxKit.xcodeproj">
          </BuildableReference>
@@ -65,7 +65,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "211826D91D257A71003F2BF2"
-            BuildableName = "SyntaxKit-tvOS.framework"
+            BuildableName = "SyntaxKit.framework"
             BlueprintName = "SyntaxKit-tvOS"
             ReferencedContainer = "container:SyntaxKit.xcodeproj">
          </BuildableReference>
@@ -83,7 +83,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "211826D91D257A71003F2BF2"
-            BuildableName = "SyntaxKit-tvOS.framework"
+            BuildableName = "SyntaxKit.framework"
             BlueprintName = "SyntaxKit-tvOS"
             ReferencedContainer = "container:SyntaxKit.xcodeproj">
          </BuildableReference>

diff --git a/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-watchOS.xcscheme b/SyntaxKit.xcodeproj/xcshareddata/xcschemes/SyntaxKit-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"