Improved parser and other stuff

.editorconfig

@@ -0,0 +1,5 @@
+[*.swift]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.swiftlint.yml

@@ -0,0 +1,54 @@
+disabled_rules:
+  - line_length
+
+opt_in_rules:
+  - attributes
+  - closure_end_indentation
+  - closure_spacing
+  - conditional_returns_on_newline
+  - empty_count
+  - explicit_enum_raw_value
+  - explicit_init
+  - explicit_top_level_acl
+  - explicit_type_interface
+  - extension_access_modifier
+  - fatal_error_message
+  - file_header
+  - first_where
+  - force_unwrapping
+  - implicit_return
+  - implicitly_unwrapped_optional
+  - joined_default_parameter
+  - let_var_whitespace
+  - multiline_parameters
+  - nimble_operator
+  - no_extension_access_modifier
+  - no_grouping_extension
+  - number_separator
+  - object_literal
+  - operator_usage_whitespace
+  - overridden_super_call
+  - pattern_matching_keywords
+  - private_outlet
+  - prohibited_super_call
+  - quick_discouraged_call
+  - redundant_nil_coalescing
+  - single_test_class
+  - sorted_imports
+  - strict_fileprivate
+  - switch_case_on_newline
+  - trailing_closure
+  - unneeded_parentheses_in_closure_argument
+  - vertical_parameter_alignment_on_call
+
+file_header:
+  required_pattern: |
+                    \/\/
+                    \/\/  .*?\.swift
+                    \/\/  SyntaxKit
+                    \/\/(
+                    \/\/ .*
+                    \/\/)?
+                    \/\/  Created by .*? on \d{1,2}\/\d{1,2}\/\d{2}\.
+                    \/\/  Copyright © \d{4}(-\d{4})? .*?\. All rights reserved\.
+                    \/\/

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 5 so Xcode 10 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, kind in
+    URL(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
 

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.'
@@ -14,4 +14,6 @@ Pod::Spec.new do |spec|
   spec.osx.frameworks = 'Foundation', 'AppKit'
 
   spec.source_files = 'SyntaxKit/*.{h,m,swift}'
+
+  spec.module_name = 'SyntaxKit'
 end