update CI, some new docs

Author: mattmassicotte

.github/workflows/ci.yml

@@ -14,5 +14,7 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
-      - name: xcodebuild test
-        run: set -o pipefail && xcodebuild test -scheme TextViewPlus -destination "platform=macOS" | xcpretty
+      - name: swift test
+        run: swift test
+      - name: carthage
+        run: carthage build --no-skip-current

.gitignore

@@ -1,2 +1,7 @@
-Carthage/
-.build
+.DS_Store
+/.build
+/Carthage
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

README.md

@@ -1,10 +1,9 @@
 [![Github CI](https://github.com/ChimeHQ/TextViewPlus/workflows/CI/badge.svg)](https://github.com/ChimeHQ/TextViewPlus/actions)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
-![](https://img.shields.io/badge/Swift-5.0-orange.svg)
 
 # TextViewPlus
 
-TextViewPlus is a collection of utilities for making it easier to work with NSTextView.
+TextViewPlus is a collection of utilities for making it easier to work with `NSTextView`.
 
 ## Integration
 
@@ -26,7 +25,7 @@ github "ChimeHQ/TextViewPlus"
 
 **Geometry**
 
-Wrappers around the underlying NSLayoutManager, but with a much more convenient API.
+Wrappers around the underlying `NSLayoutManager`, but with a much more convenient API.
 
 ```swift
 func enumerateLineFragments(for range: NSRange, block: (NSRect, NSRange) -> Void)
@@ -72,7 +71,7 @@ func boundingSelectionRects(forRange range: NSRange) -> [NSRect]
 
 **Attributed Strings**
 
-Programmtic modification of the underlying attributed string in the NSTextStorage, with support for delegate callbacks and undo.
+Programmtic modification of the underlying attributed string in the `NSTextStorage`, with support for delegate callbacks and undo.
 
 ```swift
 func replaceCharacters(in range: NSRange, with attributedString: NSAttributedString)
@@ -83,7 +82,7 @@ func replaceString(in range: NSRange, with attributedString: NSAttributedString)
 
 **Behavior**
 
-Changing NSTextView behaviors can be tricky, and often involve complex interactions with the whole system (NSLayoutManager, NSTextContainer, NSScrollView, etc).
+Changing `NSTextView` behaviors can be tricky, and often involve complex interactions with the whole system (`NSLayoutManager`, `NSTextContainer`, `NSScrollView`, etc).
 
 ```swift
 public var wrapsTextToHorizontalBounds: Bool

TextViewPlus/NSTextView+Selection.swift

@@ -10,6 +10,7 @@ import Foundation
 import class AppKit.NSTextView
 
 extension NSTextView {
+    /// All the selected ranges, as NSRange instances
     public var selectedTextRanges: [NSRange] {
         get {
             return selectedRanges.map({ $0.rangeValue })
@@ -19,6 +20,9 @@ extension NSTextView {
         }
     }
 
+    /// A single range representing a single, continuous selection
+    ///
+    /// This method returns nil if there isn't exactly one selection range.
     public var selectedContinuousRange: NSRange? {
         let ranges = selectedTextRanges
         if ranges.count != 1 {
@@ -28,6 +32,10 @@ extension NSTextView {
         return ranges.first!
     }
 
+    /// A singlel location representing a single, zero-length selection
+    ///
+    /// This method returns nil if there is more than one selected range,
+    /// or if that range has a non-zero length.
     public var insertionLocation: Int? {
         guard let range = selectedContinuousRange else {
             return nil

TextViewPlus/TextViewPlus.xcconfig

@@ -12,8 +12,8 @@
 PRODUCT_NAME = TextViewPlus
 PRODUCT_BUNDLE_IDENTIFIER = com.chimehq.TextViewPlus
 PRODUCT_MODULE_NAME = TextViewPlus
-CURRENT_PROJECT_VERSION = 6
-MARKETING_VERSION = 1.0.4
+CURRENT_PROJECT_VERSION = 7
+MARKETING_VERSION = 1.0.5
 
 INFOPLIST_FILE = TextViewPlus/Info.plist
 FRAMEWORK_SEARCH_PATHS = $(PROJECT_DIR)/Carthage/Build/Mac $(PROJECT_DIR)/Carthage/Build/Mac/Static

TextViewPlusTests/TextViewPlusTests.swift

@@ -62,4 +62,24 @@ extension TextViewPlusTests {
         XCTAssertEqual(textView.selectedRanges, [NSValue(range: NSRange(0..<0))])
         XCTAssertEqual(textView.selectedTextRanges, [NSRange(0..<0)])
     }
+
+    func testContinuousSelectionRanges() {
+        let textView = TestableTextView(string: "abc")
+
+        XCTAssertEqual(textView.selectedContinuousRange, NSRange(3..<3))
+
+        textView.selectedTextRanges = [NSRange(0..<1), NSRange(2..<3)]
+
+        XCTAssertNil(textView.selectedContinuousRange)
+    }
+
+    func testInsertionLocation() {
+        let textView = TestableTextView(string: "abc")
+
+        XCTAssertEqual(textView.insertionLocation, 3)
+
+        textView.selectedTextRanges = [NSRange(0..<1)]
+
+        XCTAssertNil(textView.insertionLocation)
+    }
 }