Merge branch 'CodeEditApp:main' into line-numbers

Author: austincondiff

Package.swift

@@ -32,6 +32,7 @@ let package = Package(
         .package(url: "https://github.com/tree-sitter/tree-sitter-rust.git", branch: "master"),
         .package(url: "https://github.com/alex-pinkus/tree-sitter-swift", branch: "with-generated-files"),
         .package(url: "https://github.com/mattmassicotte/tree-sitter-yaml.git", branch: "feature/spm"),
+        .package(url: "https://github.com/maxxnino/tree-sitter-zig.git", branch: "main"),
     ],
     targets: [
         .target(
@@ -56,6 +57,7 @@ let package = Package(
                 .product(name: "TreeSitterRust", package: "tree-sitter-rust"),
                 .product(name: "TreeSitterSwift", package: "tree-sitter-swift"),
                 .product(name: "TreeSitterYAML", package: "tree-sitter-yaml"),
+                .product(name: "TreeSitterZig", package: "tree-sitter-zig"),
             ]),
         .testTarget(
             name: "CodeEditTextViewTests",

Sources/CodeEditTextView/CodeLanguage/CodeLanguage.swift

@@ -26,6 +26,7 @@ import TreeSitterRuby
 import TreeSitterRust
 import TreeSitterSwift
 import TreeSitterYAML
+import TreeSitterZig
 
 /// A structure holding metadata for code languages
 public struct CodeLanguage {
@@ -117,6 +118,8 @@ public struct CodeLanguage {
             return tree_sitter_swift()
         case .yaml:
             return tree_sitter_yaml()
+        case .zig:
+            return tree_sitter_zig()
         case .plainText:
             return nil
         }
@@ -161,7 +164,8 @@ public extension CodeLanguage {
         .ruby,
         .rust,
         .swift,
-        .yaml
+        .yaml,
+        .zig
     ]
 
     /// A language structure for `Bash`
@@ -221,6 +225,9 @@ public extension CodeLanguage {
     /// A language structure for `YAML`
     static let yaml: CodeLanguage = .init(id: .yaml, tsName: "YAML", extensions: ["yml", "yaml"])
 
+    /// A language structure for `Zig`
+    static let zig: CodeLanguage = .init(id: .zig, tsName: "Zig", extensions: ["zig"])
+
     /// The default language (plain text)
     static let `default`: CodeLanguage = .init(id: .plainText, tsName: "Plain Text", extensions: ["txt"])
 }

Sources/CodeEditTextView/CodeLanguage/TreeSitterLanguage.swift

@@ -27,5 +27,6 @@ public enum TreeSitterLanguage: String {
     case rust
     case swift
     case yaml
+    case zig
     case plainText
 }

Sources/CodeEditTextView/CodeLanguage/TreeSitterModel.swift

@@ -17,7 +17,7 @@ public class TreeSitterModel {
     /// Get a query for a specific language
     /// - Parameter language: The language to request the query for.
     /// - Returns: A Query if available. Returns `nil` for not implemented languages
-    // swiftlint:disable:next cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     public func query(for language: TreeSitterLanguage) -> Query? {
         switch language {
         case .bash:
@@ -56,6 +56,8 @@ public class TreeSitterModel {
             return swiftQuery
         case .yaml:
             return yamlQuery
+        case .zig:
+            return zigQuery
         case .plainText:
             return nil
         }
@@ -151,6 +153,11 @@ public class TreeSitterModel {
         return queryFor(.yaml)
     }()
 
+    /// Query for `Zig` files.
+    public private(set) lazy var zigQuery: Query? = {
+        return queryFor(.zig)
+    }()
+
     private func queryFor(_ codeLanguage: CodeLanguage) -> Query? {
         guard let language = codeLanguage.language,
               let url = codeLanguage.queryURL else { return nil }