Merge branch 'main' into ep/pin-to-upstream-tree-sitter-revision

simonbs · Nov 28, 2023 · b10dc3f · b10dc3f
2 parents 48964ad + a9e6942
commit b10dc3f
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 31 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -2,7 +2,8 @@ name: Build and Test
 on:
   workflow_dispatch: {}
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
     paths:
       - '.github/workflows/build_and_test.yml'
       - 'Sources/**'
@@ -12,10 +13,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 jobs:
   build:
-    name: Build and test on iPhone 14
+    name: Build and test
     runs-on: macos-13
     steps:
       - name: Checkout
@@ -27,10 +28,10 @@ jobs:
           xcodebuild build-for-testing\
             -scheme Runestone\
             -sdk iphonesimulator\
-            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
+            -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
       - name: Test
         run: |
           xcodebuild test-without-building\
             -scheme Runestone\
             -sdk iphonesimulator\
-            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
+            -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
diff --git a/.github/workflows/build_example_project.yml b/.github/workflows/build_example_project.yml
@@ -2,18 +2,19 @@ name: Build Example Project
 on:
   workflow_dispatch: {}
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
     paths:
       - '.github/workflows/build_example_project.yml'
       - 'Example/**'
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 jobs:
   build:
-    name: Build example project for iPhone 14
+    name: Build example project
     runs-on: macos-13
     steps:
       - name: Checkout
@@ -26,4 +27,4 @@ jobs:
             -project Example/Example.xcodeproj\
             -scheme Example\
             -sdk iphonesimulator\
-            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
+            -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,14 +1,16 @@
 name: "CodeQL"
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - main
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 jobs:
   analyze:
     name: Analyze
@@ -33,7 +35,7 @@ jobs:
           xcodebuild\
             -scheme Runestone\
             -sdk iphonesimulator\
-            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
+            -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         with:

diff --git a/.github/workflows/deploy_documentation.yml b/.github/workflows/deploy_documentation.yml
@@ -9,7 +9,7 @@ concurrency:
   group: "pages"
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 jobs:
   build:
     runs-on: macos-13

diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
@@ -2,7 +2,8 @@ name: UI Tests
 on:
   workflow_dispatch: {}
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
     paths:
       - '.github/workflows/ui_tests.yml'
       - 'Sources/**'
@@ -12,7 +13,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 jobs:
   run_korean_tests:
     name: Run Korean tests

diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "TreeSitter",
+        "repositoryURL": "https://github.com/simonbs/tree-sitter",
+        "state": {
+          "branch": null,
+          "revision": "f88ae4ebe351d8aa99c31a17111607017d805118",
+          "version": "0.20.9-beta-1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Example/Example/Main/MainViewController.swift b/Example/Example/Main/MainViewController.swift
@@ -5,7 +5,7 @@ import UIKit
 final class MainViewController: UIViewController {
     override var textInputContextIdentifier: String? {
         // Returning a unique identifier makes iOS remember the user's selection of keyboard.
-        return "RunestoneExample.Main"
+        "RunestoneExample.Main"
     }
 
     private let contentView = MainView()

diff --git a/Sources/Runestone/TextView/Core/TextInputStringTokenizer.swift b/Sources/Runestone/TextView/Core/TextInputStringTokenizer.swift
@@ -28,12 +28,6 @@ final class TextInputStringTokenizer: UITextInputStringTokenizer {
         }
     }
 
-    override func isPosition(_ position: UITextPosition,
-                             withinTextUnit granularity: UITextGranularity,
-                             inDirection direction: UITextDirection) -> Bool {
-        super.isPosition(position, withinTextUnit: granularity, inDirection: direction)
-    }
-
     override func position(from position: UITextPosition,
                            toBoundary granularity: UITextGranularity,
                            inDirection direction: UITextDirection) -> UITextPosition? {
@@ -47,12 +41,6 @@ final class TextInputStringTokenizer: UITextInputStringTokenizer {
             return super.position(from: position, toBoundary: granularity, inDirection: direction)
         }
     }
-
-    override func rangeEnclosingPosition(_ position: UITextPosition,
-                                         with granularity: UITextGranularity,
-                                         inDirection direction: UITextDirection) -> UITextRange? {
-        super.rangeEnclosingPosition(position, with: granularity, inDirection: direction)
-    }
 }
 
 // MARK: - Lines
@@ -129,7 +117,7 @@ private extension TextInputStringTokenizer {
     private func isPosition(_ position: UITextPosition, atParagraphBoundaryInDirection direction: UITextDirection) -> Bool {
         // I can't seem to make Ctrl+A, Ctrl+E, Cmd+Left, and Cmd+Right work properly if this function returns anything but false.
         // I've tried various ways of determining the paragraph boundary but UIKit doesn't seem to be happy with anything I come up with ultimately leading to incorrect keyboard navigation. I haven't yet found any drawbacks to returning false in all cases.
-        return false
+        false
     }
 
     private func position(from position: UITextPosition, toParagraphBoundaryInDirection direction: UITextDirection) -> UITextPosition? {

diff --git a/Tests/RunestoneTests/TextInputStringTokenizerTests.swift b/Tests/RunestoneTests/TextInputStringTokenizerTests.swift
@@ -253,7 +253,7 @@ extension TextInputStringTokenizerTests {
 private extension TextInputStringTokenizerTests {
     private var sampleText: String {
         // swiftlint:disable line_length
-        return """
+        """
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras commodo pretium lorem et scelerisque. Sed urna massa, eleifend vel suscipit et, finibus ut nisi. Praesent ullamcorper justo ut lectus faucibus venenatis. Suspendisse lobortis libero sed odio iaculis, quis blandit ante accumsan.
 
 Quisque sed hendrerit diam. Quisque ut enim ligula.